hansolo 0.0.1.alpha.2 → 0.0.1.alpha.3

data/bin/hansolo

@@ -41,9 +41,13 @@ optparse = OptionParser.new do |opts|
   end
 end.parse!(ARGV)
 
-opts = conf_options.merge(options).inject({}){|m,(k,v)| m[k.to_sym] = v; m}
+unless conf_options.any?
+  default_conf_filename = File.expand_path(File.join(".",".hansolo.json"))
+  conf_options = JSON.parse(File.read(default_conf_filename)) if File.exists?(default_conf_filename)
+end
+
 
-puts opts.inspect
+opts = conf_options.merge(options).inject({}){|m,(k,v)| m[k.to_sym] = v; m}
 
 h = Hansolo::Cli.new conf_options.merge(opts)
 h.all!

data/lib/hansolo.rb

@@ -182,19 +182,19 @@ __END__
 This is a simple cli program to automate deploy using chef-solo and
 berkshelf.
 
-If you pass a filename, put in JSON for the configuration.  So in hans.json:
+If you pass a filename, put in JSON for the configuration.  So in .hansolo.json:
 
   { "keydir": "/Applications/Vagrant/embedded/gems/gems/vagrant-1.1.4/keys/vagrant" }
 
 Then you can pass to the command as:
 
-  $ hansolo -c hans.json
+  $ hansolo -c .hansolo.json
 
 NOTE: Command-line args trump config settings.
 
 Example Usage:
 
-  $ hansolo -t /tmp/myapp.cookbooks \
+  $ hansolo -s approval -t /tmp/myapp.cookbooks \
 
       -k /Applications/Vagrant/embedded/gems/gems/vagrant-1.1.4/keys/vagrant \
 
@@ -202,4 +202,9 @@ Example Usage:
 
       -r apt::default,myapp::deploy
 
-  $ hansolo -c hans.json
+  $ hansolo -s approval -c .hansolo.json
+
+  $ hansolo -s approval
+
+NOTE: You don't need to pass -c if you use the filename .hansolo.json.  Passing -c
+will override reading this default.

data/lib/hansolo/version.rb

@@ -1,3 +1,3 @@
 module Hansolo
-  VERSION = "0.0.1.alpha.2"
+  VERSION = "0.0.1.alpha.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hansolo
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.2
+  version: 0.0.1.alpha.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk