vmc_knife 0.0.66 → 0.0.67

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODk2MjA3YmE4N2YyNzZhMTQ1YzliMjdiNzMzMWZkNDhlMjU5Nzk2Yg==
+    ZDM2YzI4OGMwOWM1M2U3YmNlMDU3MzgxNDdlZjVhZDhlODIzNjFjMw==
   data.tar.gz: !binary |-
-    MDYyM2E5MWJmYjAxMzg1NWQxM2YyYWU3NjY2ODgzOGU0Njk2MWExYQ==
+    OWZiMDM0NjE2NWU3OGU3MmFlNTdmNzliNTI0Y2VkMGNmNzBlMmZmYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzE4OWU5NmE2ZTU1ZjI4MjYxZGIxZTI0OTE1ZjllM2Q3NDMzMThmNDY3OWNj
-    MTVmM2JiOWQ0MGIxOTQ1OGE3Y2NiNmMxZTMwZTU3NTcwYzQ4ZTg0NDhiYzA5
-    MjE3ZmI5MzhiOGJjNmI5ZDNlYjk2MmJiMTVmNGFkYWQzMmQ2MmU=
+    NDE1ZGQyZDIyZjJlZjM5Y2NhNTBhNmVjNmNjODJjZjZhNWIwMDk0NGVmNWRl
+    NTdhZTBjNDk0Y2VkMzdjYjIxZTQxNDlhY2Y3ZmM0ZDAzMzRmZTc1Mjk0Zjk2
+    NWZlYzFkYWZlOTI0Njk4ZWEzNGRlZTljYmQwYzFkMGVkYzg0OTA=
   data.tar.gz: !binary |-
-    MDI3OTg0NTVjYjYzNzdiMjM5OTlhZjVlZDVkOGNlZDE5MzA5OGI4NWMxNjU5
-    MDZiNGE1NjdhOTE5OWQxYjA4YjI4N2FkNjMwNzgxMGIzMzgwN2RiODM4ZWQ3
-    MmM2MTk1YzgyNWI3MjFjMjhkNDA5OTAzNTFlMTRkZDhhYWY0MWE=
+    NWE2Zjg2ZWQ1ZWVkMzRjYTg3MjA4OTk2MWY3MzhhZWJjZmRhM2ViNmM5M2M5
+    YzRlY2UwNmJiN2JmODhmNmRiMThiYTZlM2JkMzdjNzFkODkxOTcwNTA1Yjdh
+    Y2RiZmJiOWIzMmI0MmJiY2I1M2YwMTRiOWI1NjhlNjA0NmE3YWM=

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -215,11 +215,11 @@ module VMC::Cli::Command
     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, :force=>@options[:force]})
+                        {:apps_only=>true, :force=>@options[:force], :vmc_login => true})
     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]})
+                        {:apps_only=>true, :force=>@options[:force], :vmc_login => true})
     end
     def patch_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:patch,nil,app_names_regexp,nil,manifest_file_path,
@@ -231,15 +231,15 @@ module VMC::Cli::Command
     end
     def start_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:start,nil,app_names_regexp,nil,manifest_file_path,
-                        {:apps_only=>true})
+                        {:apps_only=>true, :vmc_login => true})
     end
     def stop_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:stop,nil,app_names_regexp,nil,manifest_file_path,
-                        {:apps_only=>true})
+                        {:apps_only=>true, :vmc_login => true})
     end
     def restart_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:restart,nil,app_names_regexp,nil,manifest_file_path,
-                        {:apps_only=>true})
+                        {:apps_only=>true, :vmc_login => 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,
@@ -248,12 +248,12 @@ module VMC::Cli::Command
     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}})
+                        {:apps_only=>true, :wait=>{:interval=>30,:retries=>6}, :vmc_login => true})
       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})
+                        {:apps_only=>true, :vmc_login => true})
       exit 1 unless res
     end
     def info_configure(app_names_regexp=nil,manifest_file_path=nil)
@@ -262,15 +262,15 @@ module VMC::Cli::Command
       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)
+      recipe_configuror(:delete,nil,app_names_regexp,nil,manifest_file_path, {:vmc_login => true})
     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})
+                        {:apps_only=>true, :vmc_login => 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})
+                        {:data_only=>true, :vmc_login => true})
     end
     def data_shell(data_names_regexp=nil,file_or_cmd=nil,app_name=nil,manifest_file_path=nil)
       file_name = nil
@@ -342,12 +342,14 @@ module VMC::Cli::Command
     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)
 
-      # login first
-      new_knife = VMC::Cli::Command::Knifemisc.new(@options)
-      new_knife.login(manifest_file_path)
-      client(new_knife.client)
-
-      raise VMC::Client::AuthError unless client.user || client.logged_in?
+      if (opts && opts[:vmc_login])
+        # login first
+        new_knife = VMC::Cli::Command::Knifemisc.new(@options)
+        new_knife.login(manifest_file_path)
+        client(new_knife.client)
+  
+        raise VMC::Client::AuthError unless client.user || client.logged_in?
+      end
 
       recipes_regexp = as_regexp(recipes_regexp)
       app_names_regexp = as_regexp(app_names_regexp)

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.66'
+      VERSION = '0.0.67'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmc_knife
 version: !ruby/object:Gem::Version
-  version: 0.0.66
+  version: 0.0.67
 platform: ruby
 authors:
 - Intalio, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vmc