vmc_knife 0.0.40 → 0.0.45

data/README.md

@@ -20,7 +20,7 @@ load the cloudfoundry profile and install the gem:
 
 Or to install from source:
 
-    git clone https://github.com/hmalphettes/vmc-knife.git
+    git clone https://github.com/intalio/vmc-knife.git
     cd vmc-knife
     gem build vmc_knife.gemspec
     gem install vmc_knife

data/lib/vmc_knife/cli_extensions.rb

@@ -8,17 +8,17 @@ require 'cli' #this is the cli from vmc.
 # as well as a short declaration of the services expected and their nature.
 # Usage: edit the json recipe.
 # vmc_knife configure-applications
-# 
+#
 # Also bundles utilities to reconfigure the hostname of the cloud_controller and the gateways accordingly:
 # vmc_knife configure-vcap
 # and publish the urls in the deployed apps with zeroconf on ubuntu (avahi)
 # vmc configure-vcap-mdns
 class VMC::Cli::KnifeRunner < VMC::Cli::Runner
-  
+
   def parse_command!
     # just return if already set, happends with -v, -h
     return if @namespace && @action
-    
+
     verb = @args.first
     case verb
 
@@ -241,13 +241,21 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
     when 'update-self'
       usage('vmc_knife update-self')
       puts "Updating vmc-knife"
-      `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`
+      `cd /tmp; [ -d "vmc-knife" ] && rm -rf vmc-knife; git clone https://github.com/intalio/vmc-knife.git; cd vmc-knife; gem build vmc_knife.gemspec; gem install vmc_knife`
       exit 0
+    when 'app-version'
+      usage('vmc_knife app-version [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      if @args.size <= 2
+        set_cmd(:knifeapps, :applications_version, @args.size)
+      else
+        set_cmd(:knifeapps, :applications_version, @args.size) # too many
+      end
     when 'help'
       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
   end
-  
+
 end

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -1,7 +1,7 @@
 # Commands for vmc_knife.
 
 module VMC::KNIFE::Cli
-  
+
   #loads the manifest file.
   #when the path is not specified, look in the current directory.
   #when the path is a directory, look for the first json file it can find.
@@ -36,9 +36,9 @@ module VMC::Cli::Command
 
   class Knife < Base
     include VMC::KNIFE::Cli
-    
+
     # expands the json manifest. outputs it in the destination path.
-    
+
     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
@@ -49,11 +49,11 @@ module VMC::Cli::Command
         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) 
+        STDOUT.puts JSON.pretty_generate(res)
       end
-      
+
     end
-    
+
     # updates the cloud_controller
     def configure_cloud_controller(cloud_controller_yml=nil,manifest_file_path_or_uri=nil)
       __update(manifest_file_path_or_uri,cloud_controller_yml,VMC::KNIFE::VCAPUpdateCloudControllerConfig,"cloud_controller")
@@ -61,7 +61,7 @@ module VMC::Cli::Command
     # updates /etc/hosts
     def configure_etc_hosts(etc_hosts=nil,manifest_file_path=nil,client=nil)
       #__update(manifest_file_path_or_uri,etc_hosts,VMC::KNIFE::VCAPUpdateEtcHosts,"/etc/hosts")
-      
+
       # this will configure /etc/hosts with the urls of your applications as well as the cloudcontroller.
       # it is not be necessary if avahi is correctly configured on your VM.
       unless manifest_file_path.nil?
@@ -92,7 +92,7 @@ module VMC::Cli::Command
       update_aliases.do_exec = true
       update_aliases.execute
     end
-    
+
     def configure_all(manifest_file_path_or_uri=nil)
       begin
         display "Stop applications ..."
@@ -144,30 +144,30 @@ module VMC::Cli::Command
     end
 
   end
-  
+
   class Knifemisc < Misc
     include VMC::KNIFE::Cli
-    
+
     # configures the target and login according to the info in the manifest.
     def login(manifest_file_path=nil)
       man  = load_manifest(manifest_file_path)
       target_url = man['target']
-      raise "No target defined in the manifest #{@manifest_path}" if target_url.nil? 
+      raise "No target defined in the manifest #{@manifest_path}" if target_url.nil?
       puts "set_target #{target_url}"
       set_target(target_url)
-      
+
       email = man['email']
       password = man['password']
       @options[:email] = email if email
       @options[:password] = password if password
-      
+
       tries ||= 0
       # login_and_save_token:
-      
+
       puts "login with #{email} #{password}"
       token = client.login(email, password)
       VMC::Cli::Config.store_token(token)
-      
+
     rescue VMC::Client::TargetError
       display "Problem with login, invalid account or password.".red
       retry if (tries += 1) < 3 && prompt_ok && !@options[:password]
@@ -176,11 +176,11 @@ module VMC::Cli::Command
       display "Problem with login, #{e}, try again or register for an account.".red
       display e.backtrace
       exit 1
-      
+
     end
-    
+
   end
-  
+
   class Knifeapps < Apps
     include VMC::KNIFE::Cli
 
@@ -195,7 +195,7 @@ module VMC::Cli::Command
     def configure_recipes(recipe_names_regexp=nil,manifest_file_path=nil)
       configure(recipe_names_regexp,nil,nil,manifest_file_path)
     end
-              
+
     # Configure the applications according to their manifest.
     # The parameters are related to selecting a subset of the applications to configure.
     # nil means all apps for all recipes found in the manifest are configured.
@@ -284,7 +284,7 @@ module VMC::Cli::Command
         end
       end
       recipe_configuror(:shell,nil,nil,data_names_regexp,manifest_file_path,
-                        {:file_name=>file_name, :data_cmd=>cmd, 
+                        {:file_name=>file_name, :data_cmd=>cmd,
                          :app_name=>app_name, :data_only=>true,
                          :single_service=>true})
     end
@@ -334,7 +334,11 @@ module VMC::Cli::Command
                         {:apps_only=>true, :log_apps=>true, :log_vcap=>false, :logs_shell=>"tail",
                          :log_files_glob=>log_files_glob})
     end
-    
+    def applications_version(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:version,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true})
+    end
+
     def recipe_configuror(method_sym_name,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)
@@ -347,7 +351,7 @@ module VMC::Cli::Command
       method_object = configurer.method(method_sym_name)
       method_object.call
     end
-    
+
     def as_regexp(arg, strict=false)
       if arg != nil && arg.kind_of?(String) && !arg.strip.empty?
         if strict && Regexp.quote(arg) == arg
@@ -357,7 +361,7 @@ module VMC::Cli::Command
         end
       end
     end
-    
+
   end
-  
+
 end

data/lib/vmc_knife/version.rb

@@ -2,7 +2,7 @@ module VMC
   module KNIFE
     module Cli
       # This version number is used as the RubyGem release version.
-      VERSION = '0.0.01'
+      VERSION = '0.0.45'
     end
   end
 end

data/lib/vmc_knife/vmc_knife.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module VMC
   module KNIFE
-    
+
     # Read/Write the JSON for a recipe.
     # Does not map the actual JSON into a new ruby object.
     class Root
@@ -47,9 +47,9 @@ module VMC
       def to_json()
         @wrapped.to_json
       end
-      
+
     end
-    
+
     class Recipe
       attr_accessor :wrapped, :root
       # root: Root
@@ -82,14 +82,14 @@ module VMC
           res << DataService.new(@root, service, name) if regexp =~ name
         end
         res
-        
+
       end
       def to_json()
         @wrapped.to_json
       end
-      
+
     end
-    
+
     # Read/Write the JSON for a dataservice.
     # Does not map the actual JSON into a new ruby object.
     class DataService
@@ -106,16 +106,16 @@ module VMC
       def vendor()
         @wrapped['vendor']
       end
-      
+
       # Returns a vcap manifest that can be used
       # to create a new data-service to vcap's cloud_controller.
       def to_vcap_manifest()
         #TODO
         @wrapped
       end
-      
+
     end
-    
+
     # Read/Write the JSON for an application.
     # Does not map the actual JSON into a new ruby object.
     class Application
@@ -138,7 +138,7 @@ module VMC
       def env()
         ApplicationEnvironment.new @wrapped['env'], self
       end
-      
+
       # Returns a vcap manifest that can be used
       # to push/update an application to vcap's cloud_controller.
       def to_vcap_manifest()
@@ -146,7 +146,7 @@ module VMC
         # if there are differences we will take care of them here.
         @wrapped
       end
-      
+
       # look for the log folder of the deployed app.
       # making the assumption we are on the same file system.
       # will use the paas APIs later.
@@ -201,7 +201,7 @@ module VMC
       end
 
     end
-    
+
     # Read/Write the application environment. a list of strings
     # where the first '=' character separate the key and values.
     class ApplicationEnvironment
@@ -210,7 +210,7 @@ module VMC
         @wrapped = data
         @application = application
       end
-      #Sets a variable. Replaces other environment variables with the 
+      #Sets a variable. Replaces other environment variables with the
       #same name if there is such a thing.
       def set(name,value)
         foundit = false
@@ -245,7 +245,7 @@ module VMC
         @wrapped << "#{name}=#{value}"
       end
     end
-    
+
     class RecipesConfigurationApplier
       attr_accessor :root, :client, :applications, :recipes, :data_services, :opts
       # Select the applications and data-services to configure according to the values
@@ -350,7 +350,7 @@ module VMC
       end
       def info()
 	configure_only=@opts[:configure_only] || false
-        if configure_only                                          
+        if configure_only
           if updates_pending().empty?
             puts "All configuration up to date: true"
             return true
@@ -372,7 +372,7 @@ module VMC
         @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
@@ -538,6 +538,17 @@ module VMC
           `rm #{output_file}` unless @opts[:output_file]
         end
       end
+      def version()
+        versions = {}
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new(application, @client)
+          ver = application_updater.version_installed()
+          puts "#{application.name()} => #{ver}" if VMC::Cli::Config.trace
+          versions[application.name()] = ver
+        end
+        puts versions
+        versions
+      end
     end
     class DataServiceManifestApplier
       attr_accessor :data_service_json, :client, :current_services, :current_services_info
@@ -564,7 +575,7 @@ module VMC
         end
         @current ||= Hash.new # that would be a new service.
       end
-      
+
       # Only for testing: inject json
       def __set_current(current,current_services=nil,current_services_info=nil)
         @current = current
@@ -612,9 +623,9 @@ module VMC
         end
         raise "vcap does not provide a data-service which vendor is #{searched_vendor}"
       end
-      
-      
-    end    
+
+
+    end
     class ApplicationManifestApplier
       attr_accessor :application_json, :client, :current_name
       # @param application The application object as defined in the SaaS manifest
@@ -634,7 +645,7 @@ module VMC
         @current_name ||= @application_json['old_name']
         @current_name ||= @application_json['name']
       end
-      
+
       def safe_app_info(name)
         begin
           return @client.app_info(name)
@@ -643,19 +654,19 @@ module VMC
           return
         end
       end
-      
+
       def current()
         return @current unless @current.nil?
         @current = safe_app_info(@current_name)
         @current ||= safe_app_info(@application_json['name']) # in case the rename occurred already.
         @current ||= Hash.new # that would be a new app.
       end
-      
+
       # Only for testing: inject json
       def __set_current(current)
         @current = current
       end
-      
+
       def execute()
         diff = updates_pending()
         if diff && diff.size > 0
@@ -667,10 +678,10 @@ module VMC
             puts "Updating #{@application_json['name']} with #{updated_manifest.inspect}"
             @client.update_app(@application_json['name'], updated_manifest)
           end
-                    
+
         end
       end
-      
+
       def version_available()
         return unless @application_json['repository']
         if @application_json['repository']['version_available'] && @application_json['repository']['version_available']['url']
@@ -724,7 +735,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
         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']
@@ -745,10 +756,10 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
             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
         end
         version_available_file
-      end 
+      end
 
       def cmd_read_version_installed()
         cmd=@application_json['repository']['version_installed']['cmd'] if @application_json['repository']['version_installed']
@@ -802,13 +813,13 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
             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
+              puts "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
@@ -825,7 +836,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
         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?
@@ -837,7 +848,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
         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
@@ -847,7 +858,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
           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"
+            puts "The staged version of #{@current_name} is the same as the one on the remote repository"
             return unless force
             puts "Forced download"
           end
@@ -858,10 +869,10 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
         end
         upload(force,do_delete_download)
       end
-    
+
       def app_download_dir_path()
         "#{ENV['HOME']}/vmc_knife_downloads/#{@application_json['name']}"
-      end 
+      end
       def extract_deployed(force=false)
         installed_v=version_installed()
         unless installed_v
@@ -890,28 +901,29 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
 	    p "The version installed and the version ready to deploy are identical: #{installed_v}"
           end
         else
-          do_extract = true  
+          do_extract = true
         end
         if do_extract
-          FileUtils.mkdir_p app_download_dir 
+          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 
+          `ls -la #{app_download_dir}`
+        end
+        do_extract
+      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=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 ?
@@ -924,7 +936,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
                   branch='master'
                 end
                 `git pull origin #{branch}`
-              else                
+              else
                 begin
                   wget_args_str = wget_args()
                   #`wget #{wget_args_str} --output-document=#{tmp_download_filename} #{url}`
@@ -964,7 +976,7 @@ wget #{wget_args()} --output-document=$version_built_download #{version_availabl
           end
         end
       end
- 
+
       def upload_app_bits()
         Dir.chdir(app_download_dir_path()) do
 puts "upload_app_bits in #{app_download_dir_path()}"
@@ -975,38 +987,43 @@ puts "upload_app_bits in #{app_download_dir_path()}"
             FileUtils.rm_rf(tmp_git) if File.exists?(tmp_git)
             FileUtils.mv(".git", tmp_git)
           end
+          ori_trace = VMC::Cli::Config.trace
           begin
-           VMC::KNIFE::HELPER.static_upload_app_bits(@client,@application_json['name'],Dir.pwd)
+            VMC::KNIFE::HELPER.static_upload_app_bits(@client,@application_json['name'],Dir.pwd)
           rescue
             FileUtils.mv(tmp_git, ".git") if File.exists?(tmp_git)
+          ensure
+            VMC::Cli::Config.trace = ori_trace
           end
         end
-      end     
+      end
 
       def patch(force=false)
-        extract_deployed(force)
-        app_download_dir=app_download_dir_path() 
+        app_download_dir=app_download_dir_path()
+        app_was_extracted = extract_deployed(force)
         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')
+        if VMC::Cli::Config.trace || app_was_extracted
+          p "Type y when ready to update. Anything else will stop."
+          ans = STDIN.gets.chomp
+          return unless ans && ans.capitalize.start_with?('Y')
+        end
         upload_app_bits()
       end
- 
+
       def start()
         #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().empty? || current[:state] == 'STOPPED'
         current[:state] = 'STOPPED'
         client.update_app(@application_json['name'], current())
       end
-      
+
       def delete()
         if current().empty?
           puts "The application #{@application_json['name']} does not exist yet" if VMC::Cli::Config.trace
@@ -1041,7 +1058,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         end
         new_app_manifest
       end
-      
+
       # Returns a json object where we see the differences.
       def updates_pending()
         name = update_name_pending()
@@ -1059,7 +1076,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         updates['meta'] = meta if meta
         updates unless updates.empty?
       end
-      
+
       def update_name_pending()
         curr_name=current[:name] || current['name']
         if curr_name.nil?
@@ -1122,13 +1139,13 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         old_debug = old_meta[:debug] || old_meta['debug']
         new_debug = new_meta['debug']
         debug_change = "#{old_debug} => #{new_debug}" if old_debug != new_debug
-        
+
         old_restage_on_service_change = old_meta[:restage_on_service_change]
         old_restage_on_service_change = old_meta['restage_on_service_change'] unless old_restage_on_service_change == false
         old_restage_on_service_change = old_restage_on_service_change.to_s unless old_restage_on_service_change.nil?
         new_restage_on_service_change = new_meta['restage_on_service_change']
         restage_on_service_change_change = "#{old_restage_on_service_change} => #{new_restage_on_service_change}" if old_restage_on_service_change != new_restage_on_service_change
-        
+
         return if debug_change.nil? && restage_on_service_change_change.nil?
         return { "debug" => debug_change } if restage_on_service_change_change.nil?
         return { "restage_on_service_change" => restage_on_service_change_change } if debug_change.nil?
@@ -1151,7 +1168,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         return { "add" => add, "remove" => remove }
       end
     end
-    
+
     # This is really a server-side vcap admin feature.
     class VCAPUpdateCloudControllerConfig
       def initialize(uri, cloud_controller_config=nil)
@@ -1192,7 +1209,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
       def execute()
         @changed = false
         @changed_gateways = Array.new
-        # look for the line that starts with external_uri: 
+        # look for the line that starts with external_uri:
         # replace it with the new uri if indeed there was a change.
         lines = IO.readlines @config
         File.open(@config, "w") do |file|
@@ -1234,7 +1251,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         @changed
       end
     end
-    
+
     # This is really a server-side feature.
     # Replace the 127.0.0.1 localhost #{old_uri} with the new uri
     class VCAPUpdateEtcHosts
@@ -1281,7 +1298,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
       def execute()
         return unless update_pending
         @changed = false
-        # look for the line that starts with external_uri: 
+        # look for the line that starts with external_uri:
         # replace it with the new uri if indeed there was a change.
         if true
           # use sudo.
@@ -1307,7 +1324,7 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         @changed
       end
     end
-    
+
     # This is really a server-side feature.
     # This is deprecated; use the dns_publisher vcap module instead.
     # Regenerates the urls to publish as aliases.
@@ -1391,6 +1408,6 @@ puts "upload_app_bits in #{app_download_dir_path()}"
         return length_already != allall.length
       end
     end
-    
+
   end # end of KNIFE
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: vmc_knife
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.45
   prerelease: 
 platform: ruby
 authors:
-- Intalio Pte
+- Intalio, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vmc
-  requirement: &28784440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.3.18
   type: :runtime
   prerelease: false
-  version_requirements: *28784440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.18
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &28783860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,31 +40,49 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *28783860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &29208120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *29208120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &29206780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *29206780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: Extensions for VMC the CLI of VMWare's Cloud Foundry
-email: hmalphettes@gmail.com
+email: eng-support@intalio.com
 executables:
 - vmc_knife
 extensions: []
@@ -70,17 +93,16 @@ files:
 - LICENSE
 - README.md
 - lib/restclient/restclient_add_timeout.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/commands/knife_cmds.rb
+- lib/vmc_knife/data_services.rb
+- lib/vmc_knife/json_expander.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
-- !binary |-
-  YmluL3ZtY19rbmlmZQ==
+- bin/vmc_knife
 homepage: http://intalio.com
 licenses: []
 post_install_message: 
@@ -101,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Extensions for VMC the CLI of VMWare's Cloud Foundry