small_wonder 0.1.2 → 0.1.3

data/README.md

@@ -59,6 +59,10 @@ You can also specify a version number to pass to the application object:
 
     $ small_wonder -p example -V 123
 
+Lastly you can create user defined tasks that get run ("deploy" is the default):
+
+    $ small_wonder -p example -a sometask
+
 #### Chef Data
 
 During the deployment Small Wonder will save data back to the Chef node. Moreover, status is updated to the task currently being run, so you can see live deployment progress in your searches.

data/lib/small_wonder.rb

@@ -70,15 +70,11 @@ module SmallWonder
         SmallWonder::Config.application_deployments_dir, '**', '*.rb')))
 
       case SmallWonder::Config.action
-      when "none"
-        SmallWonder::Log.info("No action specified, assuming deploy ...")
-        SmallWonder::Deploy.run
-      when "deploy"
-        SmallWonder::Deploy.run
       when "vicki"
         system("open http://www.youtube.com/watch?v=ukSvjqwJixw")
       else
-        SmallWonder::Log.error("Supported action \"#{SmallWonder::Config.action}\"!")
+        SmallWonder::Log.info("Using specified action: #{SmallWonder::Config.action}")
+        SmallWonder::Deploy.run
       end
 
     end

data/lib/small_wonder/cli.rb

@@ -17,8 +17,8 @@ module SmallWonder
     option :action,
       :short => "-a ACTION",
       :long  => "--action ACTION",
-      :description => "The action you want small wonder to take [deploy]",
-      :default => "none"
+      :description => "The action you want small wonder to take [deploy|anythingyouwant]",
+      :default => "deploy"
 
     option :app,
       :short => "-p APP",

data/lib/small_wonder/deploy.rb

@@ -3,7 +3,7 @@ module SmallWonder
     def self.run()
       if SmallWonder::Config.app
         nodes = SmallWonder::Deploy.node_query()
-        SmallWonder::Deploy.deploy(SmallWonder::Config.app, nodes)
+        SmallWonder::Deploy.run_action_task(SmallWonder::Config.action, SmallWonder::Config.app, nodes)
       else
         SmallWonder::Log.error("No application was specified for your deploy, use the '-p' switch.")
       end
@@ -27,7 +27,7 @@ module SmallWonder
       nodes
     end
 
-    def self.deploy(application_name, nodes)
+    def self.run_action_task(action, application_name, nodes)
       if nodes.length > 0
         SmallWonder::Log.info("Found the following nodes via your search.")
 
@@ -55,7 +55,7 @@ module SmallWonder
               application = SmallWonder::Application.new(node, application_name)
             end
 
-            deploy_application(application, sudo_password)
+            deploy_application(action, application, sudo_password)
           end
         end
       else
@@ -63,8 +63,8 @@ module SmallWonder
       end
     end
 
-    def self.deploy_application(application, sudo_password)
-      run_salticid_task(application, sudo_password)
+    def self.deploy_application(action, application, sudo_password)
+      run_salticid_task(action, application, sudo_password)
 
       if SmallWonder::Config.write_node_file
         SmallWonder::Utils.write_node_data_file(application.node_name)
@@ -73,7 +73,7 @@ module SmallWonder
 
     ## deploy step
     # Creates a new salticid host for node, and calls <app>.deploy on it.
-    def self.run_salticid_task(application, sudo_password)
+    def self.run_salticid_task(action, application, sudo_password)
       SmallWonder::Log.info("Running #{application.application_name} deployment for #{application.node_name} ...")
 
       host = SmallWonder.salticid.host application.node_name
@@ -94,7 +94,7 @@ module SmallWonder
 
       # sub hyphens for underscores to work around having hyphens in method names
       host.role application.application_name.gsub("-", "_")
-      host.send(application.application_name.gsub("-", "_")).deploy
+      host.send(application.application_name.gsub("-", "_")).__send__(action)
 
       # set the application status to final since the deploy is done
       application.status = "final"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: small_wonder
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joe Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config