corking, and a major refactor to accomodate it

2017-03-28 12:41:25 -07:00
parent f140b9b68c
commit 91526bfe5b
13 changed files with 409 additions and 1622 deletions
@@ -38,7 +38,15 @@ namespace cellar {
                string get_config(string);
                bool set_config(string, string);
        };
+        
+        extern Bottle active_bottle;
+    
 		extern map<string, Bottle> get_bottles();
+        extern string resolve_bottle(string);
+
+        extern void cork(string, bool);
+        extern void press(string, vector<string>, bool);
+        extern void uncork(string);
 	}
 }

@@ -11,8 +11,6 @@ using namespace std;
 namespace cellar {
    extern void print_header();

-    extern bottles::Bottle active_bottle;
-    
    extern bool dryrun;
    extern bool verbose;
 }
@@ -13,6 +13,7 @@ using namespace cellar::commands;
 namespace cellar {
    namespace launch {
        extern void popen(string);
+        extern void popen(vector<string>);

    /*[[[cog
         import cog