vmc_knife 0.0.11 → 0.0.12

data/lib/vmc_knife/cli_extensions.rb

@@ -186,8 +186,45 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
       else
         set_cmd(:knifeapps, :data_export, @args.size) # too many
       end
+    when 'logs','logs-all'
+      usage('vmc_knife logs-all')
+      @args.shift # consumes the argument.
+      if @args.size <= 3
+        set_cmd(:knifeapps, :logs_all, @args.size)
+      else
+        set_cmd(:knifeapps, :logs_all, @args.size) # too many
+      end
+    when 'logs-apps'
+      usage('vmc_knife logs-apps')
+      @args.shift # consumes the argument.
+      if @args.size <= 3
+        set_cmd(:knifeapps, :logs_apps, @args.size)
+      else
+        set_cmd(:knifeapps, :logs_apps, @args.size) # too many
+      end
+    when 'logs-vcap'
+      usage('vmc_knife logs-vcap')
+      @args.shift # consumes the argument.
+      if @args.size <= 3
+        set_cmd(:knifeapps, :logs_vcap, @args.size)
+      else
+        set_cmd(:knifeapps, :logs_vcap, @args.size) # too many
+      end
+    when 'logs-less','logs-shell'
+      usage('vmc_knife logs-less <application name>')
+      @args.shift # consumes the argument.
+      if @args.size <= 3
+        set_cmd(:knifeapps, :logs_less, @args.size)
+      else
+        set_cmd(:knifeapps, :logs_less, @args.size) # too many
+      end
+    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`
+      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 [<manifest_path>]"
+      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|logs-all/apps/vcap|update-self [<manifest_path>]"
     else
       super
     end

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -75,6 +75,8 @@ module VMC::Cli::Command
         man = load_manifest(nil)
         uri = man['target']
       end
+      # if there is a port remove it.
+      uri = uri.split(':')[0] if uri
       update_aliases = VMC::KNIFE::VCAPUpdateAvahiAliases.new(nil,man,client,/.*/)
       update_hosts = VMC::KNIFE::VCAPUpdateEtcHosts.new(uri,manifest_file_path,client)
       update_hosts.set_all_uris(update_aliases.all_uris)
@@ -129,6 +131,8 @@ module VMC::Cli::Command
         uri = man['target']
       end
       raise "No uri defined" unless uri
+      # if there is a port remove it.
+      uri = uri.split(':')[0]
       update_cc = _class.new(uri,config)
       if update_cc.update_pending()
         display "Configuring #{msg_label} with uri: #{uri}" if VMC::Cli::Config.trace
@@ -267,6 +271,28 @@ 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)
+      recipe_configuror(:logs,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :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,
+                        {:apps_only=>true, :log_apps=>true, :log_vcap=>false})
+    end
+    def logs_vcap(app_names_regexp=nil, manifest_file_path=nil)
+      recipe_configuror(:logs,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :log_apps=>false, :log_vcap=>true})
+    end
+    def logs_less(app_names_regexp=nil, log_files_glob=nil, manifest_file_path=nil)
+      recipe_configuror(:logs_shell,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :log_apps=>true, :log_vcap=>false, :logs_shell=>"less",
+                         :log_files_glob=>log_files_glob})
+    end
+    def logs_tail(app_names_regexp=nil, log_files_glob=nil, manifest_file_path=nil)
+      recipe_configuror(:logs_shell,nil,app_names_regexp,nil,manifest_file_path,
+                        {:apps_only=>true, :log_apps=>true, :log_vcap=>false, :logs_shell=>"tail",
+                         :log_files_glob=>log_files_glob})
+    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)

data/lib/vmc_knife/data_services.rb

@@ -103,7 +103,7 @@ module VMC
     end
     
     # command_files or command.
-    def self.data_service_console(credentials_hash, commands_file="",as_admin=false,exec_name=nil)
+    def self.data_service_console(credentials_hash, commands_file="",as_admin=false,exec_name=nil,return_value=false)
       if credentials_hash['db'] #so far it has always been equal to 'db'
         # It is a mongo service
         #/home/ubuntu/cloudfoundry/.deployments/intalio_devbox/deploy/mongodb/bin/mongo 127.0.0.1:25003/db 
@@ -146,6 +146,7 @@ module VMC
           end
           the_cmd = "#{cmd} #{commands_file}"
           puts "#{the_cmd}" if VMC::Cli::Config.trace
+          return `#{the_cmd}` if return_value
           puts `#{the_cmd}`
         else
           puts "#{cmd}" if VMC::Cli::Config.trace
@@ -242,8 +243,8 @@ module VMC
       end
       
       # Connect to the mongo js shell or the psql shell.
-      def shell(commands_file=nil,as_admin=false)
-        VMC::KNIFE.data_service_console(credentials(),commands_file,as_admin)
+      def shell(commands_file=nil,as_admin=false,return_value=false)
+        VMC::KNIFE.data_service_console(credentials(),commands_file,as_admin,nil,return_value)
       end
       
       def import(app_name=nil,file=nil)
@@ -359,10 +360,17 @@ module VMC
             extension = @wrapped['director']['file_extension'] if @wrapped['director']
             extension ||= "sql"
             file = "#{name()}.#{extension}"
+          else
+            unless File.exists?(File.dirname(file))
+              raise "The output folder #{File.dirname(file)} does not exist."
+            end
           end
           archive_unzipped=file
           archive_unzipped="#{name()}.sql" unless /\.sql$/ =~ extension
           `touch #{archive_unzipped}`
+          unless File.exists? archive_unzipped
+            raise "Unable to create the file #{archive_unzipped}"
+          end
           `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
@@ -371,6 +379,10 @@ module VMC
           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}`
+          
+          unless File.exists? file
+            raise "Unable to read the file #{file}"
+          end
           `chmod o-w #{file}`
         elsif is_mongodb
           if file.nil?
@@ -424,9 +436,12 @@ module VMC
       
       # Make sure that all users who can connect to the DB can also access
       # the tables.
-      # This workarounds the privilege issue reported here:
+      # This workarounds the privilege issue reported .... and was added to "my"
+      # branch of vcap's services 
       # 
-      def apply_privileges()
+      # 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)
         if is_postgresql()
           cmd_acl="GRANT CREATE ON SCHEMA PUBLIC TO PUBLIC;\
           GRANT ALL ON ALL TABLES IN SCHEMA PUBLIC TO PUBLIC;\
@@ -435,7 +450,30 @@ module VMC
           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)
+#          shell(cmd_acl,true)
+          
+          # reset the owner of the functions to the current user
+          # when there is a 'privileged' app.
+          app_name ||= @wrapped['director']['bound_app'] if @wrapped['director']
+          if app_name
+            cmd_select_fcts="SELECT pg_proc.proname FROM pg_catalog.pg_proc WHERE \
+     pg_proc.pronamespace=(SELECT pg_namespace.oid FROM pg_catalog.pg_namespace WHERE pg_namespace.nspname = 'public') \
+ AND pg_proc.proowner!=(SELECT oid FROM pg_roles WHERE rolname = 'postgres')"
+            current_owner=credentials()['username']
+            unless current_owner
+              STDERR.puts "The application #{app_name} is not bound to the data-service #{name}; not applying the database privileges."
+              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}`
+          end
         end
       end
       
@@ -529,7 +567,7 @@ module VMC
           puts "Unsupported operation 'drop' for the data-service #{name()}"
         end
       end
-                                                                                                                                        
+
     end
     
   end

data/lib/vmc_knife/json_expander.rb

@@ -8,27 +8,28 @@ module VMC
       # Reads the ip of a given interface and the mask
       # defaults on eth0 then on wlan0 and then whatever it can find that is not 127.0.0.1
       def self.ip_auto(interface='eth0')
-        res=`ifconfig | sed -n '/#{interface}/{n;p;}' | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
+        ifconfig = File.exist?("/sbin/ifconfig") ? "/sbin/ifconfig" : "ifconfig"
+        res=`#{ifconfig} | sed -n '/#{interface}/{n;p;}' | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
         if interface == 'eth0' && (res.nil? || res.strip.empty?)
           res = ip_auto "wlan0"
           res = res[0] if res
           if res.strip.empty?
             #nevermind fetch the first IP you can find that is not 127.0.0.1
-            res=`ifconfig | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
+            res=`#{ifconfig} | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
           end
         end
         res.strip! if res
         unless res.empty?
           # gets the Mask
-          line=`ifconfig | grep 'inet addr:#{res}' | awk '{ print $1}' | head -1`
+          line=`#{ifconfig} | grep 'inet addr:#{res}' | awk '{ print $1}' | head -1`
 #          puts "parsing ip and mask in line #{line}"
-          mask=`ifconfig | grep 'inet addr:#{res}' | grep -v '127.0.0.1' | cut -d: -f4 | awk '{ print $1}' | head -1`
+          mask=`#{ifconfig} | grep 'inet addr:#{res}' | grep -v '127.0.0.1' | cut -d: -f4 | awk '{ print $1}' | head -1`
           mask.strip!
 #          puts "got ip #{res} and mask #{mask}"
           return [ res, mask ]
         end
       end
-    
+      
       # Derive a seed guaranteed unique on the local network  according to the IP.
       def self.ip_seed()
         ip_mask=ip_auto()

data/lib/vmc_knife/vmc_knife.rb

@@ -147,6 +147,59 @@ module VMC
         @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.
+      def log(folder,log_file_glob=nil)
+        deployed_apps_folder="#{ENV['HOME']}/cloudfoundry/deployed_apps"
+        log_file_glob ||= "logs/*"
+        if File.exist?(deployed_apps_folder)
+          folder_nb=0
+          Dir.glob(File.join(deployed_apps_folder, "#{name()}-*")).each do |dir|
+            fname="#{File.basename(dir)}"
+            app_log_folder=File.join(folder,fname)
+            FileUtils.mkdir_p(app_log_folder)
+            if File.exist? "#{dir}/logs"
+              FileUtils.cp(Dir.glob(File.join("#{dir}", "logs/*")), app_log_folder)
+            end
+          end
+        end
+      end
+
+      # look for the most recent folder where we can find the stdout file.
+      # fork to the shell with the 'less' command to display the contents of the file.
+      def log_shell(shell_cmd=nil,log_file_glob=nil)
+        deployed_apps_folder="#{ENV['HOME']}/cloudfoundry/deployed_apps"
+        shell_cmd ||= "less"
+        log_file_glob ||= File.join("logs","stdout.log")
+        if File.exist?(deployed_apps_folder)
+          ts_most_recent=0
+          most_recent_file=nil
+          app_deployed=false
+          Dir.glob(File.join(deployed_apps_folder, "#{name()}-*")).each do |dir|
+            app_deployed=true
+            Dir.glob(File.join("#{dir}", log_file_glob)).each do |logfile|
+              ts=File.mtime(logfile).to_i
+              if ts > ts_most_recent
+                most_recent_file=logfile
+                ts_most_recent = ts
+              end
+            end
+          end
+          if most_recent_file
+            cmd = "#{shell_cmd} #{most_recent_file}"
+            puts "#{cmd}" if VMC::Cli::Config.trace
+            exec cmd
+          elsif app_deployed
+            raise "Could not find a log file #{log_file_glob} in the deployed app folder."
+          else
+            raise "Could not find a deployed application named #{name}"
+          end
+        else
+          raise "Could not find the deployed application folder #{deployed_apps_folder}"
+        end
+      end
+
     end
     
     # Read/Write the application environment. a list of strings
@@ -247,6 +300,24 @@ module VMC
              @application_updaters[application.name] = application_updater
              updates = application_updater.updates_pending
              applications_updates[application.name] = updates if updates
+             # 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|
+                   if data_service.name == cf_service_name
+                     # 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
+                 end
+               end
+             end
            end
         end
         res['services'] = data_services_updates unless data_services_updates.empty?
@@ -296,6 +367,74 @@ module VMC
           application_updater.execute
         end
       end
+      def logs_shell()
+        log_apps=@opts[:log_apps] if @opts
+        logs_shell=@opts[:logs_shell] if @opts
+        log_files_glob=@opts[:log_files_glob] if @opts
+        raise "The name of the application to read its log is required." unless log_apps
+        @applications.each do |application|
+           application.log_shell(logs_shell,log_files_glob)
+        end
+        raise "No application with this name was found."
+      end
+      def logs()
+        output_file=@opts[:output_file] if @opts
+        if @root.wrapped['logs']
+          man_logs=@root.wrapped['logs']
+          name_prefix=man_logs['prefix']
+          parent_output_folder=man_logs['destination']
+          if parent_output_folder
+            FileUtils.mkdir_p parent_output_folder
+            logs_base_url=man_logs['logs_base_url']
+            # TODO: clean the old files and folders if there are too many of them.
+          end
+        end
+        name_prefix||="cflogs-"
+        parent_output_folder||="/tmp"
+        name="#{name_prefix}#{Time.now.strftime("%Y%m%d-%H%M")}"
+        output_file||="#{name}.zip"
+        output_folder="#{parent_output_folder}/#{name}"
+        FileUtils.rm_rf(output_folder) if File.exist? output_folder
+        FileUtils.mkdir(output_folder)
+        log_apps=@opts[:log_apps] if @opts
+        log_vcap=@opts[:log_vcap] if @opts
+        log_apps||=false
+        log_vcap||=false
+        if log_apps
+          FileUtils.mkdir(File.join(output_folder, 'apps'))
+          @applications.each do |application|
+            application.log(File.join(output_folder, 'apps'))
+          end
+        end
+        if log_vcap
+          if ENV['CLOUD_FOUNDRY_CONFIG_PATH'] && File.exist?(ENV['CLOUD_FOUNDRY_CONFIG_PATH'])
+            vcap_log_folder = File.join(File.dirname(ENV['CLOUD_FOUNDRY_CONFIG_PATH']), "log")
+          else
+            puts "Can't find the log folder for vcap, the environment variable CLOUD_FOUNDRY_CONFIG_PATH is not defined."
+          end
+          if File.exist? vcap_log_folder
+            FileUtils.mkdir(File.join(output_folder, 'vcap'))
+            FileUtils.cp_r Dir.glob(File.join(vcap_log_folder,"*")), File.join(output_folder, 'vcap')
+          end
+        end
+        curr_dir=Dir.pwd
+        destination=parent_output_folder||curr_dir
+        copy_or_move=("/tmp" == parent_output_folder)?"mv":"cp"
+        if "/tmp" == parent_output_folder
+          puts "Generating a zip of the logs as #{curr_dir}/#{output_file}"
+        else
+          if logs_base_url
+            hostname=`hostname`.strip
+            puts "Logs available at http://#{hostname}.local#{logs_base_url}/#{name} and in the current directory."
+          end
+        end
+        `cd #{File.dirname(output_folder)}; zip -r #{output_file} #{File.basename(output_folder)}; #{copy_or_move} #{output_file} #{curr_dir}`
+        if "/tmp" == parent_output_folder
+          `rm -rf #{output_folder}`
+        else
+          `mv #{parent_output_folder}/#{output_file} #{parent_output_folder}/#{name}`
+        end
+      end
     end
     class DataServiceManifestApplier
       attr_accessor :data_service_json, :client, :current_services, :current_services_info
@@ -422,6 +561,7 @@ module VMC
             puts "Updating #{@application_json['name']} with #{updated_manifest.inspect}"
             @client.update_app(@application_json['name'], updated_manifest)
           end
+                    
         end
       end
       
@@ -515,6 +655,11 @@ module VMC
         new_app_manifest['uris'] = @application_json['uris'] unless @application_json['uris'].nil?
         new_app_manifest['services'] = @application_json['services'] unless @application_json['services'].nil?
         new_app_manifest['env'] = @application_json['env'] unless @application_json['env'].nil?
+        if @application_json['meta']
+          new_app_manifest['meta'] = Hash.new if new_app_manifest['meta'].nil?
+          new_app_manifest['meta']['debug'] = @application_json['meta']['debug'] if @application_json['meta']['debug']
+          new_app_manifest['meta']['restage_on_service_change'] = @application_json['meta']['restage_on_service_change'] if @application_json['meta']['restage_on_service_change']
+        end
         new_app_manifest
       end
       
@@ -524,6 +669,7 @@ module VMC
         services = update_services_pending()
         env = update_env_pending()
         memory = update_memory_pending()
+        meta = meta_pending()
         uris = update_uris_pending()
         updates = Hash.new
         updates['name'] = name if name
@@ -531,6 +677,7 @@ module VMC
         updates['env'] = env if env
         updates['uris'] = uris if uris
         updates['memory'] = memory if memory
+        updates['meta'] = meta if meta
         updates unless updates.empty?
       end
       
@@ -568,8 +715,8 @@ module VMC
           stack_change "#{old_stack} => #{new_stack}"
         end
         return if model_change.nil? && stack_change.nil?
-        return { "stack" => stack_change } if model_change.empty?
-        return { "model" => model_change } if stack_change.empty?
+        return { "stack" => stack_change } if model_change.nil?
+        return { "model" => model_change } if stack_change.nil?
         return { "stack" => stack_change, "model" => model_change }
       end
       def update_services_pending()
@@ -587,6 +734,25 @@ module VMC
         new_services = @application_json['uris']
         diff_lists(old_services,new_services)
       end
+      # only look for debug and restage_on_service_change
+      def meta_pending()
+        old_meta = current[:meta] || current['meta'] || {}
+        new_meta = @application_json['meta'] || {}
+        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?
+        return { "debug" => debug_change, "restage_on_service_change" => restage_on_service_change_change }
+      end
       def diff_lists(old_services,new_services)
         new_services ||= Array.new
         old_services ||= Array.new
@@ -691,16 +857,38 @@ module VMC
     # This is really a server-side feature.
     # Replace the 127.0.0.1 localhost #{old_uri} with the new uri
     class VCAPUpdateEtcHosts
+      # uri the uris (hostname) to set.
+      # accepted type for uri: space separated list; array of strings;
+      # port appended to the hostname are also tolerated and will be stripped out.
       def initialize(uri, etc_hosts_path=nil,man=nil)
         @config = etc_hosts_path
         @config ||="/etc/hosts"
-        @uri = uri
+        if uri
+          if uri.kind_of? String
+            uris_arr = uri.split(' ')
+            set_all_uris(uris_arr)
+          elsif uri.kind_of? Array
+            set_all_uris(uri)
+          end
+        end
         raise "The config file #{@config} does not exist." unless File.exists? @config
       end
       def set_all_uris(uris_arr)
-        uris_arr.push @uri unless @uri.nil?
+        if @uri
+          if @uri.kind_of? String
+            uris_arr.push @uri
+          elsif @uri.kind_of? Array
+            uris_arr = @uri + uris_arr
+          end
+        end
+        #remove the port if there is one.
+        uris_arr.collect! do |u| u.split(':')[0] end
         uris_arr.sort!
         uris_arr.uniq!
+        # filter out the local uris: we rely on mdns for them.
+        #uris_arr.delete_if do |u| u =~ /\.local$/ end
+        # for now only filter the local url with a '-'
+        uris_arr.delete_if do |u| u =~ /-.*\.local$/ end
         @uri = uris_arr.join(' ')
       end
       def update_pending()

data/lib/vmc_knife.rb

@@ -3,21 +3,10 @@ module VMCKNIFE
 end
 require "#{VMCKNIFE::ROOT_REL}/restclient/restclient_add_timeout.rb"
 
-
-module VMC
-  module Cli
-    module Command
-      autoload :Knife,         "#{VMCKNIFE::ROOT_REL}/vmc_knife/commands/knife_cmds"
-      autoload :Knifeapps,         "#{VMCKNIFE::ROOT_REL}/vmc_knife/commands/knife_cmds"
-      autoload :Knifemisc,         "#{VMCKNIFE::ROOT_REL}/vmc_knife/commands/knife_cmds"
-    end
-  end
-end
-
-
 require "#{VMCKNIFE::ROOT_REL}/vmc_knife/json_expander"
 require "#{VMCKNIFE::ROOT_REL}/vmc_knife/vmc_helper"
 require "#{VMCKNIFE::ROOT_REL}/vmc_knife/vmc_knife"
 require "#{VMCKNIFE::ROOT_REL}/vmc_knife/data_services"
 
 require "#{VMCKNIFE::ROOT_REL}/vmc_knife/cli_extensions"
+require "#{VMCKNIFE::ROOT_REL}/vmc_knife/commands/knife_cmds"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc_knife
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Intalio Pte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vmc