small_wonder 0.1.5 → 0.1.6

data/bin/small_wonder

@@ -2,4 +2,4 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'small_wonder'))
 
-SmallWonder.main
+SmallWonder.long_main

data/bin/sw

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'small_wonder'))
+
+SmallWonder.short_main

data/lib/small_wonder/cli.rb

@@ -51,10 +51,22 @@ module SmallWonder
       :default => :info,
       :proc => Proc.new { |l| l.to_sym }
 
+    help = <<-EOH
+
+      Examples:
+      $ small_wonder -a deploy -p yourapp -q "attribute:something*" -V 123
+      $ small_wonder -p yourapp
+
+      Small Wonder's short hand CLI, fewer switches but you can still use them if you want
+      $ sw APPNAME ACTION [FQDN]
+      $ sw yourapp deploy
+      $ sw yourapp deploy testing01* -V 123 # same as 'small_wonder -a deploy -p yourapp -q "fqdn:testing01*" -V 123'
+    EOH
+
     option :help,
       :short => "-h",
       :long => "--help",
-      :description => "All the help you need ...",
+      :description => help,
       :on => :tail,
       :boolean => true,
       :show_options => true,

data/lib/small_wonder.rb

@@ -39,7 +39,21 @@ module SmallWonder
       @salticid
     end
 
-    def main()
+    def long_main()
+
+      cli = SmallWonder::CLI.new
+      cli.parse_options
+
+      # consume small wonder config
+      SmallWonder::Utils.consume_config_file(cli, cli.config[:config_file])
+
+      # consume knife config
+      SmallWonder::Utils.consume_config_file(cli, cli.config[:knife_config_file])
+
+      main()
+    end
+
+    def short_main()
 
       cli = SmallWonder::CLI.new
       cli.parse_options
@@ -47,6 +61,22 @@ module SmallWonder
       # consume small wonder config
       SmallWonder::Utils.consume_config_file(cli, cli.config[:config_file])
 
+      # consume knife config
+      SmallWonder::Utils.consume_config_file(cli, cli.config[:knife_config_file])
+
+      # sw facade deploy [fqdn]
+      SmallWonder::Config.app = ARGV[0]
+      SmallWonder::Config.action = ARGV[1]
+
+      if ARGV[2]
+        SmallWonder::Config.query = "fqdn:#{ARGV[2]}"
+      end
+
+      main()
+    end
+
+    def main()
+
       unless SmallWonder::Utils.sane_working_dir?(SmallWonder::Config.remote_working_dir)
         SmallWonder::Log.error("Your remote working dir looks strange (#{SmallWonder::Config.remote_working_dir})")
         exit(1)
@@ -57,8 +87,6 @@ module SmallWonder
         exit(1)
       end
 
-      SmallWonder::Utils.consume_config_file(cli, cli.config[:knife_config_file])
-
       # inintialize chef/knife config
       Chef::Config[:node_name] = SmallWonder::Config.node_name
       Chef::Config[:client_key] = SmallWonder::Config.client_key

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: small_wonder
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joe Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 Z
+date: 2012-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -175,12 +175,14 @@ description:
 email: j@boundary.com
 executables: 
 - small_wonder
+- sw
 extensions: []
 
 extra_rdoc_files: 
 - README.md
 files: 
 - bin/small_wonder
+- bin/sw
 - lib/small_wonder/application.rb
 - lib/small_wonder/cli.rb
 - lib/small_wonder/config.rb