vmc_knife 0.0.10 → 0.0.11

data/lib/vmc_knife/cli_extensions.rb

@@ -25,13 +25,7 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
     when 'expand-manifest'
       usage('vmc_knife expand-manifest <path_to_json_manifest> <path_to_destination_expanded_manifest>')
       @args.shift # consumes the argument.
-      if @args.size == 1
-        set_cmd(:knife, :expand_manifest, 1)
-      elsif @args.size == 2
-        set_cmd(:knife, :expand_manifest, 2)
-      else
-        set_cmd(:knife, :expand_manifest)
-      end
+      set_cmd(:knife, :expand_manifest, @args.size)
     when 'login', 'target'
       usage('vmc_knife login [<path_to_json_manifest>]')
       @args.shift # consumes the argument.
@@ -137,7 +131,7 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
         set_cmd(:knifeapps, :delete_all, @args.size) # too many
       end
     when 'data-shell','psql','mongo'
-      usage('vmc_knife data-shell [<data-service-name>] [<app-name>]')
+      usage('vmc_knife data-shell [<data-service-name>] [<app-name>] [<cmd-file> or <quoted-cmd>]')
       @args.shift # consumes the argument.
       if @args.size <= 2
         set_cmd(:knifeapps, :data_shell, @args.size)
@@ -177,7 +171,7 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
         set_cmd(:knifeapps, :data_shrink, @args.size) # too many
       end
     when 'data-import'
-      usage('vmc_knife data-import [<data-service-name>] [<tables-collection-regexp>]')
+      usage('vmc_knife data-import [<data-service-name>] [<archive-file-name>] [<tables-collection-regexp>]')
       @args.shift # consumes the argument.
       if @args.size <= 3
         set_cmd(:knifeapps, :data_import, @args.size)
@@ -185,7 +179,7 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
         set_cmd(:knifeapps, :data_import, @args.size) # too many
       end
     when 'data-export'
-      usage('vmc_knife data-export [<data-service-name>] [<tables-collection-regexp>]')
+      usage('vmc_knife data-export [<data-service-name>] [<archive-file-name>] [<tables-collection-regexp>]')
       @args.shift # consumes the argument.
       if @args.size <= 3
         set_cmd(:knifeapps, :data_export, @args.size)

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -38,17 +38,20 @@ module VMC::Cli::Command
     include VMC::KNIFE::Cli
     
     # expands the json manifest. outputs it in the destination path.
-    def expand_manifest(manifest_file_path, destination=nil)
+    
+    def expand_manifest(manifest_file_path=ENV['VMC_KNIFE_DEFAULT_RECIPE'], destination=nil)
       res = VMC::KNIFE::JSON_EXPANDER.expand_json manifest_file_path
-      if destination.nil?
-        noextension = File.basename(manifest_file_path, File.extname(manifest_file_path))
-        destination = File.join File.dirname(manifest_file_path), "#{noextension}.expanded.json"
-      end
-      display "Expanding the manifest #{manifest_file_path} into #{destination}"
-      if VMC::Cli::Config.trace
-        display JSON.pretty_generate(res)
+      if destination
+        display "Expanding the manifest #{manifest_file_path} into #{destination}"
+        if VMC::Cli::Config.trace
+          display JSON.pretty_generate(res)
+        end
+        File.open(destination, 'w') {|f| f.write(JSON.pretty_generate(res)) }
+      else
+        STDERR.puts "Expanding the manifest #{manifest_file_path}"
+        STDOUT.puts JSON.pretty_generate(res) 
       end
-      File.open(destination, 'w') {|f| f.write(JSON.pretty_generate(res)) }
+      
     end
     
     # updates the cloud_controller
@@ -194,12 +197,12 @@ module VMC::Cli::Command
     # nil means all apps for all recipes found in the manifest are configured.
     # @param recipes The list of recipes: nil: search the apps in all recipes
     # @param app_role_names The names of the apps in each recipe; nil: configure all apps found.
-    def configure(recipes_regexp=nil,app_names_regexp=nil,service_names_regexp=nil,manifest_file_path=nil)
+    def configure(recipes_regexp=nil,app_names_regexp=nil,service_names_regexp=nil,manifest_file_path=nil,opts=nil)
       man = load_manifest(manifest_file_path)
       recipes_regexp = as_regexp(recipes_regexp)
       app_names_regexp = as_regexp(app_names_regexp)
       service_names_regexp = as_regexp(service_names_regexp)
-      configurer = VMC::KNIFE::RecipesConfigurationApplier.new(man,client,recipes_regexp,app_names_regexp,service_names_regexp)
+      configurer = VMC::KNIFE::RecipesConfigurationApplier.new(man,client,recipes_regexp,app_names_regexp,service_names_regexp,opts)
       if VMC::Cli::Config.trace
         display "Pending updates"
         display JSON.pretty_generate(configurer.updates_pending)
@@ -226,9 +229,19 @@ module VMC::Cli::Command
     def delete_all(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:delete,nil,app_names_regexp,nil,manifest_file_path)
     end
-    def data_shell(data_names_regexp=nil,manifest_file_path=nil)
+    def data_shell(data_names_regexp=nil,file_or_cmd=nil,app_name=nil,manifest_file_path=nil)
+      file_name = nil
+      cmd = nil
+      if file_or_cmd
+        if File.exist? file_or_cmd
+          file_name = file_or_cmd
+        else
+          cmd = file_or_cmd
+          cmd = cmd[1..-1] if cmd.start_with?('"') || cmd.start_with?("'")
+        end
+      end
       recipe_configuror(:shell,nil,nil,data_names_regexp,manifest_file_path,
-                        {:data_only=>true})
+                        {:file_name=>file_name, :data_cmd=>cmd, :app_name=>app_name, :data_only=>true})
     end
     def data_credentials(data_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:credentials,nil,nil,data_names_regexp,manifest_file_path,
@@ -238,11 +251,11 @@ module VMC::Cli::Command
       recipe_configuror(:apply_privileges,nil,nil,data_names_regexp,manifest_file_path,
                         {:data_only=>true})
     end
-    def data_import(data_names_regexp=nil,app_name=nil,file_names=nil,manifest_file_path=nil)
+    def data_import(data_names_regexp=nil,file_names=nil,app_name=nil,manifest_file_path=nil)
       recipe_configuror(:import,nil,nil,data_names_regexp,manifest_file_path,
                         {:file_names=>file_names, :app_name=>app_name, :data_only=>true})
     end
-    def data_export(data_names_regexp=nil,app_name=nil,file_names=nil,manifest_file_path=nil)
+    def data_export(data_names_regexp=nil,file_names=nil,app_name=nil,manifest_file_path=nil)
       recipe_configuror(:export,nil,nil,data_names_regexp,manifest_file_path,
                         {:file_names=>file_names, :app_name=>app_name, :data_only=>true})
     end

data/lib/vmc_knife/data_services.rb

@@ -119,7 +119,6 @@ module VMC
           db_arg = "--db #{credentials_hash['db']}"
         end
         cmd = "#{mongo_shell} -u #{credentials_hash['username']} -p #{credentials_hash['password']} #{credentials_hash['hostname']}:#{credentials_hash['port']}#{db_arg}"
-        puts "Executing #{cmd}"
         if commands_file
           if mongo_shell == 'mongo'
             if File.exists? commands_file
@@ -129,8 +128,11 @@ module VMC
               commands_file = "--eval \"#{commands_file}\""
             end
           end
-          `#{cmd} #{commands_file}`
+          the_cmd = "#{cmd} #{commands_file}"
+          puts "#{the_cmd}" if VMC::Cli::Config.trace
+          puts `#{the_cmd}`
         else
+          puts "#{cmd}" if VMC::Cli::Config.trace
           # Replaces the current process.
           exec cmd
         end
@@ -142,8 +144,11 @@ module VMC
           else
             commands_file = "-c \"#{commands_file}\" #{PSQL_RAW_RES_ARGS}"
           end
-          `#{cmd} #{commands_file}`
+          the_cmd = "#{cmd} #{commands_file}"
+          puts "#{the_cmd}" if VMC::Cli::Config.trace
+          puts `#{the_cmd}`
         else
+          puts "#{cmd}" if VMC::Cli::Config.trace
           # Replaces the current process.
           exec cmd
         end
@@ -173,9 +178,14 @@ module VMC
     
     class RecipesConfigurationApplier
       def shell()
+        app_name = @opts[:app_name] if @opts
+        file_name = @opts[:file_name] if @opts
+        data_cmd = @opts[:data_cmd] if @opts
+        if data_cmd
+          file_name = data_cmd
+        end
         @data_services.each do |data_service|
-          app_name = opts()[:app_name] if opts()
-          data_service.shell(app_name)
+          data_service.shell(file_name)
         end
       end
       def credentials()
@@ -196,8 +206,8 @@ module VMC
         end
       end
       def export()
-        file_names = opts()[:file_names] if opts()
-        app_name = opts()[:app_name] if opts()
+        file_names = @opts[:file_names] if @opts
+        app_name = @opts[:app_name] if @opts
         @data_services.each do |data_service|
           data_service.export(app_name,file_names)
         end
@@ -322,7 +332,7 @@ module VMC
             base_dir=VMC::KNIFE.get_mongodb_base_dir()
             instance_name=creds['name']
             dbpath=File.join(base_dir, instance_name, 'data')            
-            mongod_lock=File.join(dbpath,'mongo.lock')
+            mongod_lock=File.join(dbpath,'mongod.lock')
             
             if File.exists?(mongod_lock) && File.size(mongod_lock)>0
               # the mongodb instance is currently working. connect to it and do the work.
@@ -350,13 +360,15 @@ module VMC
             extension ||= "sql"
             file = "#{name()}.#{extension}"
           end
-          `touch #{file}`
-          `chmod o+w #{file}`
+          archive_unzipped=file
+          archive_unzipped="#{name()}.sql" unless /\.sql$/ =~ extension
+          `touch #{archive_unzipped}`
+          `chmod o+w #{archive_unzipped}`
           puts "Exports the database #{credentials(app_name)['name']} in #{file}"
           #sudo -u postgres env PGPASSWORD=intalio DBNAME=intalio DUMPFILE=intalio_dump.sql pg_dump --format=p --file=$DUMPFILE --no-owner --clean --blobs --no-acl --oid --no-tablespaces $DBNAME
           #sudo -u postgres env PGPASSWORD=$PGPASSWORD DUMPFILE=$DUMPFILE pg_dump --format=p --file=$DUMPFILE --no-owner --clean --blobs --no-acl --oid --no-tablespaces $DBNAME
 
-          cmd = VMC::KNIFE.pg_connect_cmd(credentials(app_name), 'pg_dump', false, "--format=p --file=#{file} --no-owner --clean --oids --blobs --no-acl --no-privileges --no-tablespaces")
+          cmd = VMC::KNIFE.pg_connect_cmd(credentials(app_name), 'pg_dump', false, "--format=p --file=#{archive_unzipped} --no-owner --clean --oids --blobs --no-acl --no-privileges --no-tablespaces")
           puts cmd
           puts `#{cmd}`
           `chmod o-w #{file}`
@@ -374,29 +386,32 @@ module VMC
           base_dir=VMC::KNIFE.get_mongodb_base_dir()
           instance_name=creds['name']
           dbpath=File.join(base_dir, instance_name, 'data')            
-          mongod_lock=File.join(dbpath,'mongo.lock')
+          mongod_lock=File.join(dbpath,'mongod.lock')
+          puts "looking at #{mongod_lock} exists? #{File.exists?(mongod_lock)} size #{File.size(mongod_lock)}"
           if File.exists?(mongod_lock) && File.size(mongod_lock)>0
-            cmd = "#{mongodump_exec} -u #{credentials_hash['username']} -p #{credentials_hash['password']} --host #{credentials_hash['hostname']}:#{credentials_hash['port']}"
+            cmd = "#{mongodump_exec} -u #{creds['username']} -p #{creds['password']} --host #{creds['hostname']}:#{creds['port']} --db db"
           else
             cmd = "#{mongodump_exec} --dbpath #{dbpath}"
           end
           puts cmd
           puts `#{cmd}`
+          archive_unzipped="dump"
+        end
           
-          # this produces a dump folder in the working directory.
-          # let's zip it:
-          if /\.zip$/ =~ extension
-            # just zip
-            `zip -r #{file} dump/`
-          elsif /\.tar$/ =~ extension
-            # just tar
-            `tar cvf #{file} dump/`
-          else
-            # tar-gzip by default
-            `tar czvf #{file} dump/`
-          end
-          `rm -rf dump`
+        
+        # this produces a dump folder in the working directory.
+        # let's zip it:
+        if /\.zip$/ =~ file
+          # just zip
+          `zip -r #{file} #{archive_unzipped}`
+        elsif /\.tar$/ =~ file
+          # just tar
+          `tar -cvf #{file} #{archive_unzipped}`
+        else
+          # tar-gzip by default
+          `tar -czvf #{file} #{archive_unzipped}`
         end
+        `rm -rf #{archive_unzipped}` if archive_unzipped != file
       end
       
       def is_postgresql()
@@ -416,7 +431,10 @@ module VMC
           cmd_acl="GRANT CREATE ON SCHEMA PUBLIC TO PUBLIC;\
           GRANT ALL ON ALL TABLES IN SCHEMA PUBLIC TO PUBLIC;\
           GRANT ALL ON ALL FUNCTIONS IN SCHEMA PUBLIC TO PUBLIC;\
-          GRANT ALL ON ALL SEQUENCES IN SCHEMA PUBLIC TO PUBLIC;"
+          GRANT ALL ON ALL SEQUENCES IN SCHEMA PUBLIC TO PUBLIC;\
+          ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO PUBLIC;\
+          ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO PUBLIC;\
+          ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON FUNCTIONS TO PUBLIC;"
           shell(cmd_acl,true)
         end
       end
@@ -429,7 +447,7 @@ module VMC
         base_dir=VMC::KNIFE.get_mongodb_base_dir()
         instance_name=creds['name']
         dbpath=File.join(base_dir, instance_name, 'data')            
-        mongod_lock=File.join(dbpath,'mongo.lock')
+        mongod_lock=File.join(dbpath,'mongod.lock')
         raise "Can't shrink #{name}; the mongodb is currently running" if File.exists?(mongod_lock) && File.size(mongod_lock)>0
         mongodump_exec=VMC::KNIFE.get_mongo_exec('mongodump')
         raise "Can't find mongodump" unless File.exist? mongodump_exec

data/lib/vmc_knife/json_expander.rb

@@ -35,11 +35,11 @@ module VMC
         ip = ip_mask[0]
         mask = ip_mask[1]
         ip_segs = ip.split('.')
-        if mask == "255.255.255.0"
+        if mask.start_with? "255.255.255."
           ip_segs[3]
-        elsif mask == "255.255.0.0"
+        elsif mask.start_with? "255.255"
           "#{ip_segs[2]}-#{ip_segs[3]}"
-        elsif mask == "255.0.0.0"
+        elsif mask.start_with? "255."
           "#{ip_segs[1]}-#{ip_segs[2]}-#{ip_segs[3]}"
         else
           #hum why are we here?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc_knife
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Intalio Pte