vmc_knife 0.0.13 → 0.0.40

data/lib/vmc_knife/cli_extensions.rb

@@ -93,11 +93,19 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
     when 'upload-applications','upload-apps'
       usage('vmc_knife upload-apps [<applications_regexp>]')
       @args.shift # consumes the argument.
-      if @args.size <= 2
-        set_cmd(:knifeapps, :upload_applications, @args.size)
-      else
-        set_cmd(:knifeapps, :upload_applications, @args.size) # too many
-      end
+      set_cmd(:knifeapps, :upload_applications, @args.size)
+    when 'update-applications','update-apps'
+      usage('vmc_knife update-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :update_applications, @args.size)
+    when 'patch-applications','patch-apps'
+      usage('vmc_knife patch-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :patch_applications, @args.size)
+    when 'extract-deployed-apps', 'extract-apps'
+      usage('vmc_knife extract-deployed-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :extract_deployed_applications, @args.size)
     when 'start-applications','start-apps'
       usage('vmc_knife start-apps [<applications_regexp>]')
       @args.shift # consumes the argument.
@@ -122,14 +130,34 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
       else
         set_cmd(:knifeapps, :restart_applications, @args.size) # too many
       end
+    when 'info-applications','info-apps','version-apps'
+      usage('vmc_knife info-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :info_applications, @args.size)
+    when 'running-apps?', 'running-apps'
+      usage('vmc_knife running?-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :running_applications?, @args.size)
+    when 'wait-till-running-apps'
+      usage('vmc_knife wait-till-running-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :wait_till_running_applications, @args.size)
+    when 'info-configure','info-configure-apps'
+      usage('vmc_knife info-configure [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :info_configure, @args.size)
     when 'delete-all'
       usage('vmc_knife delete-all [<applications_regexp>]')
       @args.shift # consumes the argument.
-      if @args.size <= 2
-        set_cmd(:knifeapps, :delete_all, @args.size)
-      else
-        set_cmd(:knifeapps, :delete_all, @args.size) # too many
-      end
+      set_cmd(:knifeapps, :delete_all, @args.size)
+    when 'delete-apps'
+      usage('vmc_knife delete-apps [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :delete_apps, @args.size)
+    when 'delete-data','delete-services'
+      usage('vmc_knife delete-data [<data_regexp>]')
+      @args.shift # consumes the argument.
+      set_cmd(:knifeapps, :delete_data, @args.size)
     when 'data-shell','psql','mongo'
       usage('vmc_knife data-shell [<data-service-name>] [<app-name>] [<cmd-file> or <quoted-cmd>]')
       @args.shift # consumes the argument.
@@ -173,19 +201,11 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
     when 'data-import'
       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)
-      else
-        set_cmd(:knifeapps, :data_import, @args.size) # too many
-      end
+      set_cmd(:knifeapps, :data_import, @args.size)
     when 'data-export'
       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)
-      else
-        set_cmd(:knifeapps, :data_export, @args.size) # too many
-      end
+      set_cmd(:knifeapps, :data_export, @args.size)
     when 'logs','logs-all'
       usage('vmc_knife logs-all')
       @args.shift # consumes the argument.
@@ -224,7 +244,7 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
       `cd /tmp; [ -d "vmc-knife" ] && rm -rf vmc-knife; git clone https://github.com/hmalphettes/vmc-knife.git; cd vmc-knife; gem build vmc_knife.gemspec; gem install vmc_knife`
       exit 0
     when 'help'
-      display "vmc_knife expand-manifest|login|start/stop/restart-apps|upload-apps|configure-all|configure-recipes|configure-apps|configure-services|delete-all|configure-vcap|configure-vcap-mdns|configure-vcap-etc-hosts|data-shell|data-export/import/shrink/drop|logs-less|less|tail|logs-all/apps/vcap|update-self [<manifest_path>]"
+      display "vmc_knife expand-manifest|login|start/stop/restart-apps|upload-apps|configure-all|configure-recipes|configure-apps|configure-services|info-configure-apps|info-apps|update-apps|patch-apps|running-apps|wait-till-running-apps|delete-app/data/all|configure-vcap|configure-vcap-mdns|configure-vcap-etc-hosts|data-shell|data-export/import/shrink/drop|logs-less|less|tail|logs-all/apps/vcap|update-self [<manifest_path>]"
     else
       super
     end

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -213,10 +213,21 @@ module VMC::Cli::Command
       end
       configurer.execute
     end
-    
     def upload_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:upload,nil,app_names_regexp,nil,manifest_file_path,
-                        {:apps_only=>true})
+                        {:apps_only=>true, :force=>@options[:force]})
+    end
+    def update_applications(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:update,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :force=>@options[:force]})
+    end
+    def patch_applications(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:patch,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :force=>@options[:force]})
+    end
+    def extract_deployed_applications(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:extract_deployed,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :force=>@options[:force]})
     end
     def start_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:start,nil,app_names_regexp,nil,manifest_file_path,
@@ -230,9 +241,37 @@ module VMC::Cli::Command
       recipe_configuror(:restart,nil,app_names_regexp,nil,manifest_file_path,
                         {:apps_only=>true})
     end
+    def info_applications(app_names_regexp=nil,manifest_file_path=nil)
+      res=recipe_configuror(:info,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true})
+      exit 1 unless res
+    end
+    def wait_till_running_applications(app_names_regexp=nil,manifest_file_path=nil)
+      res=recipe_configuror(:running_applications?,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :wait=>{:interval=>30,:retries=>6}})
+      exit 1 unless res
+    end
+    def running_applications?(app_names_regexp=nil,manifest_file_path=nil)
+      res=recipe_configuror(:running_applications?,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true})
+      exit 1 unless res
+    end
+    def info_configure(app_names_regexp=nil,manifest_file_path=nil)
+      res=recipe_configuror(:info,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :configure_only=>true})
+      exit 1 unless res
+    end
     def delete_all(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:delete,nil,app_names_regexp,nil,manifest_file_path)
     end
+    def delete_apps(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:delete,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true})
+    end
+    def delete_data(services_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:delete,nil,nil,services_names_regexp,manifest_file_path,
+                        {:data_only=>true})
+    end
     def data_shell(data_names_regexp=nil,file_or_cmd=nil,app_name=nil,manifest_file_path=nil)
       file_name = nil
       cmd = nil
@@ -245,7 +284,9 @@ module VMC::Cli::Command
         end
       end
       recipe_configuror(:shell,nil,nil,data_names_regexp,manifest_file_path,
-                        {:file_name=>file_name, :data_cmd=>cmd, :app_name=>app_name, :data_only=>true})
+                        {:file_name=>file_name, :data_cmd=>cmd, 
+                         :app_name=>app_name, :data_only=>true,
+                         :single_service=>true})
     end
     def data_credentials(data_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:credentials,nil,nil,data_names_regexp,manifest_file_path,
@@ -271,9 +312,9 @@ module VMC::Cli::Command
       recipe_configuror(:shrink,nil,nil,data_names_regexp,manifest_file_path,
                         {:collection_or_table_names=>collection_or_table_names, :data_only=>true})
     end
-    def logs_all(app_names_regexp=nil, manifest_file_path=nil)
+    def logs_all(app_names_regexp=nil, output_file=nil, manifest_file_path=nil)
       recipe_configuror(:logs,nil,app_names_regexp,nil,manifest_file_path,
-                        {:apps_only=>true, :log_apps=>true, :log_vcap=>true})
+                        {:apps_only=>true, :output_file=>output_file, :log_apps=>true, :log_vcap=>true})
     end
     def logs_apps(app_names_regexp=nil, manifest_file_path=nil)
       recipe_configuror(:logs,nil,app_names_regexp,nil,manifest_file_path,
@@ -298,18 +339,25 @@ module VMC::Cli::Command
       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,opts)
+      opts ||= {}
+      service_names_regexp = as_regexp(service_names_regexp, opts[:single_service])
+      configurer = VMC::KNIFE::RecipesConfigurationApplier.new(man, client,
+                                                               recipes_regexp, app_names_regexp,
+                                                               service_names_regexp, opts)
       method_object = configurer.method(method_sym_name)
       method_object.call
     end
     
-    def as_regexp(arg)
+    def as_regexp(arg, strict=false)
       if arg != nil && arg.kind_of?(String) && !arg.strip.empty?
-        Regexp.new(arg)
+        if strict && Regexp.quote(arg) == arg
+          Regexp.new('^'+arg+'$')
+        else
+          Regexp.new(arg)
+        end
       end
     end
     
   end
   
-end
+end

data/lib/vmc_knife/data_services.rb

@@ -30,14 +30,14 @@ module VMC
         
     def self.get_app_id(app_name)
        db=get_ccdb_credentials()
-       app_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from apps where name='#{app_name}'\" #{PSQL_RAW_RES_ARGS}`
-       app_id
+       app_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from apps where name='#{app_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+       app_id unless app_id.empty?
     end
     def self.get_service_config_id(service_name)
        db=get_ccdb_credentials()
        #todo add the user_id
-       service_config_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`
-       service_config_id
+       service_config_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+       service_config_id unless service_config_id.empty?
     end
     
     # Returns a hash of the credentials for a data-service
@@ -65,11 +65,15 @@ module VMC
     def self.get_credentials(service_name, app_name=nil)
        db=get_ccdb_credentials()
        if app_name.nil?
-         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`
+         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_configs where alias='#{service_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
        else
          app_id = get_app_id(app_name)
+				 if app_id.nil?
+					 puts "WARN: No application named #{app_name} exists at this point" if VMC::Cli::Config.trace
+					 return
+				 end
          service_config_id = get_service_config_id(service_name)
-         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_bindings where app_id = '#{app_id}' and service_config_id='#{service_config_id}'\" #{PSQL_RAW_RES_ARGS}`
+         credentials_str = `psql --username #{db['username']} --dbname #{db['database']} -c \"select credentials from service_bindings where app_id = '#{app_id}' and service_config_id='#{service_config_id}'\" #{PSQL_RAW_RES_ARGS}`.strip
        end
        res = Hash.new
        credentials_str.split("\n").each do | line |
@@ -116,14 +120,13 @@ module VMC
         elsif exec_name == 'mongodump'
           db_arg = "" # dump all the databases including 'admin' which contains the users.
         else
-          db_arg = "--db #{credentials_hash['db']}"
+          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}"
+        cmd = "#{mongo_shell} -u #{credentials_hash['username']} -p #{credentials_hash['password']} #{'-h' if(exec_name=='mongorestore')} #{credentials_hash['hostname']}:#{credentials_hash['port']}#{db_arg}"
         if commands_file
-          if mongo_shell == 'mongo'
+          if exec_name == 'mongo'
             if File.exists? commands_file
-              # not supported yet.
-              commands_file = "--eval \"#{`cat commands_file`}"
+              commands_file = "--eval \"`cat #{commands_file}`\""
             else
               commands_file = "--eval \"#{commands_file}\""
             end
@@ -232,6 +235,7 @@ module VMC
       include Interactive
       
       # The credentials hash for this data-service
+      # param app_name The favored app usually bound to this data_service
       def credentials(app_name=nil)
         #bound_app is the name of an app bound to the dat-service and that credentials
         #should be used to access the data-service.
@@ -267,7 +271,11 @@ module VMC
             file=File.expand_path(file,current_wd)
             basename = File.basename(file).to_s
           end
-          if Dir.entries(Dir.pwd).size == 2
+          
+          unless File.exists?(basename)
+            Dir.foreach(Dir.pwd) { |f|
+              File.delete(f) unless f == '.' || f == '..'
+            }
             if file =~ /^https?:\/\// || file =~ /^ftp:\/\//
               wget_args = @wrapped['director']['wget_args']
               if wget_args.nil?
@@ -279,11 +287,11 @@ module VMC
               end
               `wget #{wget_args_str} --output-document=#{basename} #{file}`
               if $? != 0
-                `rm #{data_download_dir}/#{basename}`
+                File.delete("#{data_download_dir}/#{basename}")
                 raise "Unable to successfully download #{file}"
               end
             else
-              `cp #{file} #{basename}`
+              FileUtils.cp(file, basename)
             end
           end
           #unzip if necessary (in progress)
@@ -302,7 +310,7 @@ module VMC
           if is_unzipped
             #`rm #{basename}`
             files = Dir.glob("*.sql") if is_postgresql
-            files = Dir.glob("*.bson") if is_mongodb
+            files = Dir.glob("**/*.bson") if is_mongodb
             files ||= Dir.glob("*")
             raise "Can't find the db-dump file." if files.empty?
             file = files.first
@@ -310,10 +318,11 @@ module VMC
             file = basename
           end
           
+          creds=credentials(app_name)
+          
           if is_postgresql
             p "chmod o+w #{file}"
             `chmod o+w #{file}`
-            creds=credentials(app_name)
             if /\.sql$/ =~ file
               other_params="--file #{file} --quiet"
               cmd = VMC::KNIFE.pg_connect_cmd(creds, 'psql',as_admin=false, other_params)
@@ -324,7 +333,7 @@ module VMC
               #`pg_restore --dbname=#{dbname} --username=#{username} --no-acl --no-privileges --no-owner #{file}`
             end
             puts cmd
-            puts `#{cmd}`
+            puts `#{cmd}`.strip
             `chmod o-w #{file}`
           elsif is_mongodb
             
@@ -338,7 +347,7 @@ module VMC
             if File.exists?(mongod_lock) && File.size(mongod_lock)>0
               # the mongodb instance is currently working. connect to it and do the work.
               # in that case import the 'db' alone. don't do the 'admin'
-              VMC::KNIFE.data_service_console(creds, File.dirname(file),false,'mongorestore')
+              VMC::KNIFE.data_service_console(creds, File.dirname(file), false, 'mongorestore')
             else
               # the mongodb instance is not currently working
               # go directly on the filesystem
@@ -442,14 +451,15 @@ module VMC
       # Another workaround though really not perfect so it will stay in vmc_knife:
       # the ownership of the SQL functions.
       def apply_privileges(app_name=nil)
+        return if credentials(app_name).nil?
         if is_postgresql()
           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;\
-          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;"
+  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;\
+  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)
           
           # reset the owner of the functions to the current user
@@ -465,14 +475,18 @@ module VMC
               return
             end
             fcts_name=shell(cmd_select_fcts,true,true)
-            fcts = fcts_name.split("\n").collect do |line|
-              line.strip!
-              "'#{line}'"
-            end.join(',')
-            cmd_change_fcts_owner="UPDATE pg_catalog.pg_proc \
-                SET proowner = (SELECT oid FROM pg_roles WHERE rolname = '#{current_owner}')\
-                WHERE pg_proc.proname IN (#{fcts})"
-            puts `sudo -u postgres psql --dbname #{credentials()['name']} -c \"#{cmd_change_fcts_owner}\" #{PSQL_RAW_RES_ARGS}`
+            if fcts_name.empty?
+              puts "No need to re-assign the ownership of the functions in #{credentials()['name']}; the DB does not define its own functions." if VMC::Cli::Config.trace
+            else
+              fcts = fcts_name.split("\n").collect do |line|
+                line.strip!
+                "'#{line}'"
+              end.join(',')
+              cmd_change_fcts_owner="UPDATE pg_catalog.pg_proc \
+ SET proowner = (SELECT oid FROM pg_roles WHERE rolname = '#{current_owner}')\
+ WHERE pg_proc.proname IN (#{fcts})"
+              puts `sudo -u postgres psql --dbname #{credentials()['name']} -c \"#{cmd_change_fcts_owner}\" #{PSQL_RAW_RES_ARGS}`
+            end
           end
         end
       end
@@ -509,7 +523,7 @@ module VMC
           if collection_or_table_names
             sel_tables = "#{sel_tables} AND table_name LIKE '#{collection_or_table_names}'"
           end
-          tables = shell(sel_tables)
+          tables = shell(sel_tables, false, true)
           tables_arr = Array.new
           tables.split("\n").each do | line |
             line.strip!

data/lib/vmc_knife/vmc_helper.rb

@@ -1,4 +1,8 @@
 require 'json'
+require 'cli/frameworks'
+# add java_start our own framework to the array of well known frameworks
+VMC::Cli::Framework::FRAMEWORKS['JavaGen'] = ['java_start',{ :mem => '512M', :description => 'Java Custom Application'}]
+
 module VMC
   module KNIFE
     module HELPER

data/lib/vmc_knife/vmc_knife.rb

@@ -303,7 +303,6 @@ module VMC
              # if we did bind to a database; let's re-assign the ownership of the sql functions
              # to the favorite app if there is such a thing.
              if updates && updates['services'] && updates['services']['add']
-               puts "THE ONE WE ARE DEBUGGING #{JSON.pretty_generate updates['services']}"
                list_services_name=updates['services']['add']
                list_services_name.each do |cf_service_name|
                  @data_services.each do |data_service|
@@ -311,7 +310,6 @@ module VMC
                      # is this the privileged app?
                      priv_app_name = data_service.wrapped['director']['bound_app'] if data_service.wrapped['director']
                      if priv_app_name == application.name
-                       puts "GOT THE PRIVILEGED APP #{application.name} for the service #{data_service.role_name}"
                        data_service.apply_privileges(priv_app_name)
                      end
                    end
@@ -329,14 +327,52 @@ module VMC
       def upload()
         @applications.each do |application|
           application_updater = ApplicationManifestApplier.new application, @client
-          application_updater.upload
+          application_updater.upload(@opts[:force])
         end
       end
+      def update()
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new application, @client
+          application_updater.update(@opts[:force])
+        end
+      end
+      def patch()
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new application, @client
+          application_updater.patch(@opts[:force])
+        end
+      end
+      def extract_deployed()
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new application, @client
+          application_updater.extract_deployed(@opts[:force])
+        end
+      end
+      def info()
+	configure_only=@opts[:configure_only] || false
+        if configure_only                                          
+          if updates_pending().empty?
+            puts "All configuration up to date: true"
+            return true
+          else
+            puts "All configuration up to data: false"
+            return false
+          end
+        end
+        up_to_date=true
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new application, @client
+          app_up_to_date = application_updater.info()
+          up_to_date = false unless app_up_to_date
+        end
+        puts "All up to date: #{up_to_date}"
+        return up_to_date
+      end
       def delete()
         @applications.each do |application|
           application_updater = ApplicationManifestApplier.new application, @client
           application_updater.delete
-        end
+        end 
         @data_services.each do |data_service|
           data_service_updater = DataServiceManifestApplier.new data_service, @client, @current_services, @current_services_info
           data_service_updater.delete
@@ -352,6 +388,57 @@ module VMC
           application_updater.stop
         end
       end
+      def running_applications?()
+        if @opts && @opts[:wait]
+          tries = @opts[:wait][:retries]
+          tries = tries.to_i if tries
+          interval = @opts[:wait][:interval]
+          interval = interval.to_i if interval
+        end
+        tries ||= 1
+        interval ||= 30
+        curr_iteration = 0
+        already_running = {}
+        @applications.each do |application|
+          already_running[application.name] = "false"
+        end
+        vmc_apps = Array.new
+        while (curr_iteration <= tries)
+          # brute approach: cmd-line.
+          vmc_apps = ENV['TEST_VMC_APPS_STRING'] # this is for testing.
+          unless vmc_apps
+            vmc_apps = `vmc apps`.strip.split("\n")
+            raise "Unable to run vmc" unless $?.exitstatus == 0
+          end
+          current_healths = Hash.new
+          vmc_apps.each do |line|
+            if line =~ /^\| (\S*)\s*\|\s*\d*\s*\|\s*(\S*)\s*\|/
+               app = $1
+               health = $2
+               current_healths[app] = health
+            end
+          end
+          not_running = Array.new
+          @applications.each do |application|
+            #health = `echo "#{vmc_apps}" | grep \|\ #{application.name}\ | cut -d '|' -f4`
+            health = current_healths[application.name]
+            already_running[application.name] = health
+            not_running << application.name unless health == 'RUNNING'
+          end
+          all_running = not_running.empty?
+          curr_iteration = curr_iteration + 1
+          break if not_running.empty? || curr_iteration == tries
+          p "Sleeping #{interval}s as #{not_running.join(' ')} #{not_running.size == 1 ? 'is' : 'are' } not running yet."
+          sleep(interval)
+        end
+        p "Success: all apps are running" if all_running
+        return true if all_running
+        p "At least one app is not running"
+        vmc_apps.each do |line|
+          p line
+        end
+        return false
+      end
       def start()
         @applications.each do |application|
           application_updater = ApplicationManifestApplier.new application, @client
@@ -388,6 +475,7 @@ module VMC
             logs_base_url=man_logs['logs_base_url']
             # TODO: clean the old files and folders if there are too many of them.
           end
+          other_logs = man_logs['other_logs']
         end
         name_prefix||="cflogs-"
         parent_output_folder||="/tmp"
@@ -417,6 +505,16 @@ module VMC
             FileUtils.cp_r Dir.glob(File.join(vcap_log_folder,"*")), File.join(output_folder, 'vcap')
           end
         end
+        if other_logs
+          other_logs_dir=File.join(output_folder, 'other_logs')
+          FileUtils.mkdir other_logs_dir
+          other_logs.each do |name,glob|
+            other_dir=File.join(other_logs_dir, name)
+            FileUtils.mkdir other_dir
+            FileUtils.cp_r Dir.glob(glob), other_dir
+          end
+        end
+
         curr_dir=Dir.pwd
         destination=parent_output_folder||curr_dir
         copy_or_move=("/tmp" == parent_output_folder)?"mv":"cp"
@@ -425,7 +523,8 @@ module VMC
         else
           if logs_base_url
             hostname=`hostname`.strip
-            puts "Logs available at http://#{hostname}.local#{logs_base_url}/#{name} and in the current directory."
+            complete_base_url= logs_base_url =~ /:\/\// ? logs_base_url : "http://#{hostname}.local#{logs_base_url}"
+            puts "Logs available at #{complete_base_url}/#{name} and in #{parent_output_folder}/#{name}"
           end
         end
         `cd #{File.dirname(output_folder)}; zip -r #{output_file} #{File.basename(output_folder)}; #{copy_or_move} #{output_file} #{curr_dir}`
@@ -434,6 +533,10 @@ module VMC
         else
           `mv #{parent_output_folder}/#{output_file} #{parent_output_folder}/#{name}`
         end
+        if logs_base_url
+          # not the most elegant code to cp then delete:
+          `rm #{output_file}` unless @opts[:output_file]
+        end
       end
     end
     class DataServiceManifestApplier
@@ -481,8 +584,11 @@ module VMC
         client.create_service @data_service_json['vendor'], @data_service_json['name']
       end
       def delete()
-        raise "The service #{@data_service_json['name']} does not exist." if current().empty?
-        client.delete_service(@data_service_json['name'])
+        if current().empty?
+          puts "The service #{@data_service_json['name']} does not exist." if VMC::Cli::Config.trace
+        else
+          client.delete_service(@data_service_json['name'])
+        end
       end
 
       # Returns the service manifest for the vendor.
@@ -565,18 +671,250 @@ module VMC
         end
       end
       
-      def upload()
+      def version_available()
+        return unless @application_json['repository']
+        if @application_json['repository']['version_available'] && @application_json['repository']['version_available']['url']
+          version_available_url=@application_json['repository']['version_available']['url']
+          url = @application_json['repository']['url']
+          cmd=@application_json['repository']['version_available']['cmd']
+          if version_available_url.start_with?("./")
+            version_available_url.slice!(0)
+            version_available_url.slice!(0)
+          end
+          unless /:\/\// =~ version_available_url || version_available_url.start_with?("/")
+            rel_url=File.dirname(url)
+            version_available_file||=version_available_file
+            version_available_url="#{rel_url}/#{version_available_url}"
+            p "version_available_url: #{version_available_url}" if VMC::Cli::Config.trace
+            p "extract with #{cmd}" if VMC::Cli::Config.trace
+          end
+          ## This will find out the available version.
+`version_built_download=/tmp/version_built_download
+wget #{wget_args()} --output-document=$version_built_download #{version_available_url} --output-file=/tmp/wget_#{@application_json['name']}_available`
+          available_version=`version_built_download=/tmp/version_built_download;#{cmd}`.strip
+          available_version.gsub(/^["']|["']$/, '')
+        end
+      end
+
+      # returns the internal id of the app in the cloud_controller database
+      def ccdb_app_id()
+        KNIFE::get_app_id(@current_name)
+      end
+      # the sha1 of the staged package
+      def ccdb_staged_hash()
+        ccdb_app_hash('staged_package_hash')
+      end
+      # The sha1 of the package; not staged
+      def ccdb_package_hash()
+        ccdb_app_hash('package_hash')
+      end
+
+      # hash_type: 'staged_package_hash' or 'package_hash'
+      def ccdb_app_hash(hash_type='staged_package_hash')
+        db=KNIFE::get_ccdb_credentials()
+        # todo: add the id of the current vcap user. not a problem unless we have multiple vcap users.
+        app_id = `psql --username #{db['username']} --dbname #{db['database']} -c \"select id from apps where name='#{@current_name}'\" #{PSQL_RAW_RES_ARGS}`.strip
+        unless app_id
+          raise "Can't find the app #{@current_name} amongst the deployed apps in the cloud_controller."
+        end
+        staged_hash=`psql --username #{db['username']} --dbname #{db['database']} -c \"select #{hash_type} from apps where id='#{app_id}'\" #{PSQL_RAW_RES_ARGS}`.strip
+        unless app_id
+          raise "The app #{@current_name} is not staged yet."
+        end
+        staged_hash.strip! if staged_hash
+        staged_hash
+      end
+     
+      def version_available_file_path(prefix_app_by_default=true)
+        # extract the file that contains the version from that tar.gz
+        version_available_file=@application_json['repository']['version_installed']['staged_entry'] if @application_json['repository']['version_installed']
+        unless version_available_file
+          # default on the available url prefixed by the 'app' folder
+          if @application_json['repository']['version_available'] && @application_json['repository']['version_available']['url']
+            version_available_url=@application_json['repository']['version_available']['url']
+            if version_available_url.start_with?("./")
+              version_available_url.slice!(0)
+              version_available_url.slice!(0)
+              version_available_file= prefix_app_by_default ? "app/#{version_available_url}" : version_available_url
+            elsif !(/:\/\// =~ version_available_url) && !(version_available_url.start_with?("/"))
+              version_available_file= prefix_app_by_default ? "app/#{version_available_url}" : version_available_url
+            end
+          end
+        else
+          if version_available_file.start_with?('app/') && !prefix_app_by_default
+            version_available_file=version_available_file['app/'.length..-1]
+          elsif version_available_file.start_with?('tomcat/webapp/ROOT/') && !prefix_app_by_default
+            version_available_file=version_available_file['tomcat/webapp/ROOT/'.length..-1]
+          end 
+        end
+        version_available_file
+      end 
+
+      def cmd_read_version_installed()
+        cmd=@application_json['repository']['version_installed']['cmd'] if @application_json['repository']['version_installed']
+        cmd||=@application_json['repository']['version_available']['cmd'] if @application_json['repository']['version_available']
+        cmd
+      end
+
+      def read_version(droplet_dot_version,cmd)
+        if File.exists? droplet_dot_version
+          installed_version=`version_built_download=#{droplet_dot_version};#{cmd}`.strip
+          raise "could not read the installed version in \
+              #{File.expand_path(version_available_file)} with version_built_download=#{droplet_dot_version};#{cmd}" unless installed_version
+          installed_version.gsub!(/^["']|["']$/, '')
+          puts "#{@current_name} is staged with version installed_version #{installed_version}" if VMC::Cli::Config.trace
+          return installed_version
+        end
+      end
+
+      def droplet_file_path()
+        return unless @application_json['repository']
+        return unless ccdb_app_id()
+        # go into the cloud_controller db, find out the staged_hash
+        staged_hash=ccdb_staged_hash()
+        return unless staged_hash && !staged_hash.empty?
+        droplet="/var/vcap/shared/droplets/#{staged_hash}"
+        raise "Can't find the staged droplet file #{droplet}." unless File.exist?(droplet)
+        return droplet
+      end
+
+      # Reads the version installed
+      def version_installed()
+        droplet=droplet_file_path()
+        return unless droplet
+        version_available_file = version_available_file_path()
+        unless version_available_file
+          puts "Don't know what file stores the version installed of #{@current_name}" if VMC::Cli::Config.trace
+          return
+        end
+        cmd = cmd_read_version_installed()
+        unless cmd
+          puts "Don't know how to read the version installed with a cmd." if VMC::Cli::Config.trace
+          return
+        end
+        puts "Looking for the installed version here #{droplet} // #{version_available_file}" if VMC::Cli::Config.trace
+        puts "   with cmd #{cmd}" if VMC::Cli::Config.trace
+        droplet_dot_version="#{droplet}.version"
+        unless File.exists? droplet_dot_version
+          Dir.chdir("/tmp") do
+            `[ -f #{version_available_file} ] && rm #{version_available_file}`
+            `tar -xzf #{droplet} #{version_available_file}`
+            if File.exist?(version_available_file)
+              `cp #{version_available_file} #{droplet_dot_version}`
+            else
+              put "Could not find the installed version file here: here #{droplet} // #{version_available_file}" if VMC::Cli::Config.trace
+            end
+          end
+        end
+        installed_version=read_version(droplet_dot_version,cmd)
+      end
+      
+      def info()
+        app_id=ccdb_app_id()
+        if app_id
+          staged_hash=ccdb_staged_hash()||"deployed; not staged"
+          installed_v=version_installed()||"deployed; can't read installed version"
+        else
+          installed_v="not uploaded"
+          staged_hash="not staged"
+        end
+        available_v=version_available()||"none"
+        puts "Application #{@application_json['name']}"
+        puts "  Version installed: #{installed_v}; Staged hash: #{staged_hash}"
+        puts "  Version available: #{available_v}"
+        return installed_v == available_v if installed_v && available_v
+        return false
+      end
+      
+      def wget_args()
+        _wget_args = @application_json['repository']['wget_args']
+        if _wget_args.nil?
+          wget_args_str = ""
+        elsif _wget_args.kind_of? Array
+          wget_args_str = wget_args.join(' ')
+        elsif _wget_args.kind_of? String
+          wget_args_str = wget_args
+        end
+        wget_args_str
+      end
+      
+      def update(force=false)
+        raise "The application #{@application_json['name']} does not exist yet" if current().empty?
+        do_delete_download=false
+        begin
+          installed_version=version_installed()
+          p "#{@current_name} installed_version #{installed_version}"
+          available_version=version_available()
+          p "#{@current_name} available_version #{available_version}"
+          if installed_version == available_version
+            puts "The staged version of #{@current_name} is the same than the one on the remote repository"
+            return unless force
+            puts "Forced download"
+          end
+          do_delete_download=true
+        rescue => e
+          p "Trying to read the installed and available version crashed. #{e}"
+          p e.backtrace.join("\n") if VMC::Cli::Config.trace
+        end
+        upload(force,do_delete_download)
+      end
+    
+      def app_download_dir_path()
+        "#{ENV['HOME']}/vmc_knife_downloads/#{@application_json['name']}"
+      end 
+      def extract_deployed(force=false)
+        installed_v=version_installed()
+        unless installed_v
+          puts "No deployed app #{@application_json['name']}. Not extracting it"
+          return
+        end
+        do_extract=false
+        app_download_dir=app_download_dir_path()
+        if force
+          FileUtils.rm_rf app_download_dir if File.exists?(app_download_dir)
+          do_extract=true
+        elsif File.exists?(app_download_dir)
+          version_file_in_download = File.join(app_download_dir,  version_available_file_path(false))
+          p "Reading the version of the downloaded app folder in file #{version_file_in_download}"
+          cmd_to_read=cmd_read_version_installed()
+          version_downloaded=read_version(version_file_in_download,cmd_to_read)
+	  if installed_v != version_downloaded
+	    p "The version installed is #{installed_v} and the version ready to be deployed is #{version_downloaded}"
+	    p "Would you like to replace the app to deploy by the one already deployed?"
+	    ans = STDIN.gets.chomp
+            if ans && ans.capitalize.start_with?('Y')
+              FileUtils.rm_rf app_download_dir if File.exists?(app_download_dir)
+              do_extract=true
+            end
+	  else
+	    p "The version installed and the version ready to deploy are identical: #{installed_v}"
+          end
+        else
+          do_extract = true  
+        end
+        if do_extract
+          FileUtils.mkdir_p app_download_dir 
+          drop_f_p=droplet_file_path()
+          p "tar -xzvf #{drop_f_p}"
+          `cd /tmp; [ -d drop_app ] && rm -rf drop_app; mkdir drop_app; cd drop_app; tar -xzvf #{drop_f_p}; [ -d app ] && mv app/* #{app_download_dir} || mv tomcat/webapps/ROOT/* #{app_download_dir}`
+          p "Done. ls -la #{app_download_dir}"
+          `ls -la #{app_download_dir}` 
+        end 
+      end 
+      def upload(force=false,do_delete_download=false)
         raise "The application #{@application_json['name']} does not exist yet" if current().empty?
         return unless @application_json['repository']
         url = @application_json['repository']['url']
+        
         Dir.chdir(ENV['HOME']) do
           tmp_download_filename="_download_.zip"
-          app_download_dir="vmc_knife_downloads/#{@application_json['name']}"
+          app_download_dir=app_download_dir_path()
+          `rm -rf #{app_download_dir}` if File.exist?("#{app_download_dir}") && do_delete_download
           `rm -rf #{app_download_dir}` if File.exist? "#{app_download_dir}/#{tmp_download_filename}"
+          
           FileUtils.mkdir_p app_download_dir
           Dir.chdir(app_download_dir) do
-            if Dir.entries(Dir.pwd).size == 2
-              #empty directory.
+            if Dir.entries(Dir.pwd).size == 2 #empty directory ?
               if /\.git$/ =~ url
                 `git clone #{url} --depth 1`
                 branch = @application_json['repository']['branch']
@@ -586,17 +924,13 @@ module VMC
                   branch='master'
                 end
                 `git pull origin #{branch}`
-              else
+              else                
                 begin
-                  wget_args = @application_json['repository']['wget_args']
-                  if wget_args.nil?
-                    wget_args_str = ""
-                  elsif wget_args.kind_of? Array
-                    wget_args_str = wget_args.join(' ')
-                  elsif wget_args.kind_of? String
-                    wget_args_str = wget_args
-                  end
-                  `wget #{wget_args_str} --output-document=#{tmp_download_filename} #{url}`
+                  wget_args_str = wget_args()
+                  #`wget #{wget_args_str} --output-document=#{tmp_download_filename} #{url}`
+                  #TODO: find the same file in the installed apps.
+`touch /tmp/wget_#{@application_json['name']};\
+ wget #{wget_args_str} --output-document=#{tmp_download_filename} #{url} --output-file=/tmp/wget_#{@application_json['name']}`
                   raise "Unable to download #{url}" unless $? == 0
                   if /\.tgz$/ =~ url || /\.tar\.gz$/ =~ url
                     `tar zxvf #{tmp_download_filename}`
@@ -606,34 +940,79 @@ module VMC
                     `unzip #{tmp_download_filename}`
                   end
                 ensure
-                  `rm #{tmp_download_filename}`
+                  `[ -f #{tmp_download_filename} ] && rm #{tmp_download_filename}`
                 end
+=begin            else
+              if /\.git$/ =~ url
+                branch = @application_json['repository']['branch']||"master"
+                `git checkout #{branch}`
+                `git pull origin #{branch}`
+=end
               end
             end
-            Dir.chdir(@application_json['repository']['sub_dir']) if @application_json['repository']['sub_dir']
-            `rm -rf .git` if File.exists? ".git"
-            VMC::KNIFE::HELPER.static_upload_app_bits(@client,@application_json['name'],Dir.pwd)
+            post_download_script = @application_json['repository']['post_download_script']
+            if post_download_script
+              curr_dir=Dir.pwd
+              post_download_script = post_download_script.join("\n") if post_download_script.kind_of?(Array)
+              p "Executing the post_download script : #{post_download_script}"
+              success = system(post_download_script)
+              p "Done executing the post_download script succcess #{success}"
+              exit unless success
+              Dir.chdir(curr_dir)
+            end
+            upload_app_bits()
           end
         end
       end
-      
+ 
+      def upload_app_bits()
+        Dir.chdir(app_download_dir_path()) do
+puts "upload_app_bits in #{app_download_dir_path()}"
+          Dir.chdir(@application_json['repository']['sub_dir']) if @application_json['repository']['sub_dir']
+          tmp_git = "/tmp/#{@application_json['name']}.git"
+          if File.exists? ".git"
+            # don't deploy the .git repo
+            FileUtils.rm_rf(tmp_git) if File.exists?(tmp_git)
+            FileUtils.mv(".git", tmp_git)
+          end
+          begin
+           VMC::KNIFE::HELPER.static_upload_app_bits(@client,@application_json['name'],Dir.pwd)
+          rescue
+            FileUtils.mv(tmp_git, ".git") if File.exists?(tmp_git)
+          end
+        end
+      end     
+
+      def patch(force=false)
+        extract_deployed(force)
+        app_download_dir=app_download_dir_path() 
+        p "Application ready to be patched in #{app_download_dir}"
+        p "Type y when ready to update. Anything else will stop."
+        ans = STDIN.gets.chomp
+        return unless ans && ans.capitalize.start_with?('Y')
+        upload_app_bits()
+      end
+ 
       def start()
-        raise "The application #{@application_json['name']} does not exist yet" if current().empty?
-        return if current[:state] == 'STARTED'
+        #raise "The application #{@application_json['name']} does not exist yet" if current().empty?
+        return if current().empty? || current[:state] == 'STARTED'
         current[:state] = 'STARTED'
         client.update_app(@application_json['name'], current())
       end
       
       def stop()
-        raise "The application #{@application_json['name']} does not exist yet" if current().empty?
-        return if current[:state] == 'STOPPED'
+        #raise "The application #{@application_json['name']} does not exist yet" if current().empty?
+        return if current().empty? || current[:state] == 'STOPPED'
         current[:state] = 'STOPPED'
         client.update_app(@application_json['name'], current())
       end
       
       def delete()
-        raise "The application #{@application_json['name']} does not exist yet" if current().empty?
-        client.delete_app(@application_json['name'])
+        if current().empty?
+          puts "The application #{@application_json['name']} does not exist yet" if VMC::Cli::Config.trace
+        else
+          client.delete_app(@application_json['name']) unless current().empty?
+        end
       end
 
       # Generate the updated application manifest:
@@ -693,7 +1072,9 @@ module VMC
       def update_memory_pending()
         old_mem = current[:resources][:memory] if current[:resources]
         old_mem ||= current['resources']['memory'] if current['resources']
+        old_mem = old_mem.to_i if old_mem && old_mem.kind_of?(String)
         new_mem = @application_json['resources']['memory'] unless @application_json['resources'].nil?
+        new_mem = new_mem.to_i if new_mem && new_mem.kind_of?(String)
         if old_mem != new_mem
           return "#{old_mem} => #{new_mem}"
         end

metadata

@@ -1,151 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vmc_knife
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.0.40
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 13
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - Intalio Pte
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: vmc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &28784440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 62196459
-        segments: 
-        - 0
-        - 3
-        - 14
-        - beta
-        - 4
-        version: 0.3.14.beta4
+      - !ruby/object:Gem::Version
+        version: 0.3.18
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *28784440
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &28783860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *28783860
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &29208120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *29208120
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &29206780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *29206780
 description: Extensions for VMC the CLI of VMWare's Cloud Foundry
 email: hmalphettes@gmail.com
-executables: 
+executables:
 - vmc_knife
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.md
 - lib/restclient/restclient_add_timeout.rb
-- lib/vmc_knife/cli_extensions.rb
-- lib/vmc_knife/commands/knife_cmds.rb
-- lib/vmc_knife/data_services.rb
 - lib/vmc_knife/json_expander.rb
+- lib/vmc_knife/data_services.rb
+- lib/vmc_knife/commands/knife_cmds.rb
+- lib/vmc_knife/vmc_knife.rb
+- lib/vmc_knife/cli_extensions.rb
 - lib/vmc_knife/mongo/mongo_cmd.js.erb
 - lib/vmc_knife/version.rb
 - lib/vmc_knife/vmc_helper.rb
-- lib/vmc_knife/vmc_knife.rb
 - lib/vmc_knife.rb
-- bin/vmc_knife
+- !binary |-
+  YmluL3ZtY19rbmlmZQ==
 homepage: http://intalio.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Extensions for VMC the CLI of VMWare's Cloud Foundry
 test_files: []
-