heirloom 0.4.1rc1 → 0.5.0rc1

data/CHANGELOG

@@ -1,6 +1,11 @@
-## TBD:
+## v0.5.0:
 
 * Added check to verify domain exists for all cmds except build
+* Removing requirement to check simpledb on download.
+* Adding requirement base_prefix on download.
+* Fix error when .heirloom.yml does not exist.
+* Refactor cli option validation
+* Refactor cli specs
 
 ## v0.4.0:
 

data/lib/heirloom/cli/authorize.rb

@@ -10,10 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:accounts, 
-                                                   :name, :id],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:accounts, :name, :id],
+                             :config   => @config
 
         ensure_domain_exists :name => @opts[:name], :config => @config
 

data/lib/heirloom/cli/build.rb

@@ -10,11 +10,10 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts, 
-                                     :required => [:name, :id, :region, 
-                                                   :base_prefix, 
-                                                   :directory],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts, 
+                             :required => [:name, :id, :region, 
+                                           :base_prefix, :directory],
+                             :config   => @config
 
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],

data/lib/heirloom/cli/destroy.rb

@@ -10,9 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:name, :id],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:name, :id],
+                             :config   => @config
 
         ensure_domain_exists :name => @opts[:name], :config => @config
 

data/lib/heirloom/cli/download.rb

@@ -10,10 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:base_prefix, :name,
-                                                   :id, :output],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:base_prefix, :name, :id, :output],
+                             :config   => @config
 
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],

data/lib/heirloom/cli/list.rb

@@ -10,9 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:name],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:name],
+                             :config   => @config
 
         ensure_domain_exists :name => @opts[:name], :config => @config
 

data/lib/heirloom/cli/shared.rb

@@ -2,10 +2,23 @@ module Heirloom
   module CLI
     module Shared
 
-      def valid_options?(args)
+      def load_config(args)
+        opts = args[:opts]
+        logger = args[:logger]
+        config = Config.new :logger => logger
+        config.access_key = opts[:key] if opts[:key_given]
+        config.secret_key = opts[:secret] if opts[:secret_given]
+        config
+      end
+
+      def ensure_valid_options(args)
         provided = args[:provided]
         required = args[:required]
-        logger = args[:logger]
+        config   = args[:config]
+        logger   = config.logger
+
+        required << :key unless config.access_key
+        required << :secret unless config.secret_key
 
         missing_opts = required.map do |opt|
           case provided[opt]
@@ -20,16 +33,7 @@ module Heirloom
 
         missing_opts.each {|missing_opt| logger.error missing_opt}
 
-        missing_opts.empty?
-      end
-
-      def load_config(args)
-        opts = args[:opts]
-        logger = args[:logger]
-        config = Config.new :logger => logger
-        config.access_key = opts[:key] if opts[:key_given]
-        config.secret_key = opts[:secret] if opts[:secret_given]
-        config
+        exit 1 unless missing_opts.empty?
       end
 
       def ensure_domain_exists(args)

data/lib/heirloom/cli/show.rb

@@ -10,9 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:name],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:name],
+                             :config   => @config
 
         ensure_domain_exists :name => @opts[:name], :config => @config
 

data/lib/heirloom/cli/update.rb

@@ -10,11 +10,9 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        exit 1 unless valid_options? :provided => @opts,
-                                     :required => [:name, :id, 
-                                                   :attribute, 
-                                                   :updated_value],
-                                     :logger   => @logger
+        ensure_valid_options :provided => @opts,
+                             :required => [:name, :id, :attribute, :updated_value],
+                             :config   => @config
 
         ensure_domain_exists :name => @opts[:name], :config => @config
 

data/lib/heirloom/config.rb

@@ -4,21 +4,27 @@ module Heirloom
     attr_accessor :access_key, :secret_key, :primary_region, :logger
 
     def initialize(args = {})
-      @config = args[:config]
+      @config = args[:config] ? args[:config] : load_config_file
       self.logger = args[:logger] ||= HeirloomLogger.new
-      load_config_file
+      load_config
     end
 
-    def load_config_file
-      config_file = "#{ENV['HOME']}/.heirloom.yml"
-      config = @config ? @config : YAML::load(File.open(config_file))
-
-      aws = config['aws']
-
+    def load_config
+      aws = @config['aws']
       self.access_key = aws['access_key']
       self.secret_key = aws['secret_key']
       self.primary_region = aws['primary_region'] ||= 'us-west-1'
     end
 
+    def load_config_file
+      config_file = "#{ENV['HOME']}/.heirloom.yml"
+
+      if File.exists? config_file
+        YAML::load File.open(config_file)
+      else
+        { 'aws' => Hash.new }
+      end
+    end
+
   end
 end

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.4.1rc1"
+  VERSION = "0.5.0rc1"
 end

data/spec/cli/authorize_spec.rb

@@ -8,15 +8,17 @@ describe Heirloom do
                 :accounts => ['test@test.com'],
                 :name     => 'archive_name',
                 :id       => '1.0.0' }
-    @logger_mock = mock 'logger'
+    @logger_stub = stub
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_stub,
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_mock
+                             and_return @logger_stub
     Heirloom::CLI::Authorize.any_instance.should_receive(:load_config).
-                             with(:logger => @logger_mock,
+                             with(:logger => @logger_stub,
                                   :opts   => options).
                              and_return @config_mock
     Heirloom::Archive.should_receive(:new).

data/spec/cli/build_spec.rb

@@ -16,6 +16,9 @@ describe Heirloom do
 
     @logger_stub = stub :error => true, :info => true
     @config_mock = mock 'config'
+    @config_mock.stub :logger     => @logger_stub,
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     @archive_mock = mock 'archive'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
@@ -32,7 +35,7 @@ describe Heirloom do
     @build = Heirloom::CLI::Build.new
   end
 
-  it "should build an account" do
+  it "should build an archive" do
     @archive_mock.should_receive(:buckets_exist?).
                   with(:bucket_prefix => 'base',
                        :regions       => ["us-west-1", "us-west-2"]).

data/spec/cli/destroy_spec.rb

@@ -7,15 +7,17 @@ describe Heirloom do
     options = { :name  => 'archive_name',
                 :id    => '1.0.0',
                 :level => 'info' }
-    @logger_mock = mock 'logger'
+    @logger_stub = stub 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_stub,
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_mock
+                             and_return @logger_stub
     Heirloom::CLI::Destroy.any_instance.should_receive(:load_config).
-                             with(:logger => @logger_mock,
+                             with(:logger => @logger_stub,
                                   :opts   => options).
                              and_return @config_mock
     Heirloom::Archive.should_receive(:new).

data/spec/cli/download_spec.rb

@@ -10,16 +10,18 @@ describe Heirloom do
                 :output      => '/tmp/test123',
                 :region      => 'us-east-1',
                 :base_prefix => 'base' }
-    @logger_mock = mock 'logger'
+    @logger_stub = stub 'logger'
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_stub,
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).
                              with(:log_level => 'info').
-                             and_return @logger_mock
+                             and_return @logger_stub
     Heirloom::CLI::Download.any_instance.should_receive(:load_config).
-                            with(:logger => @logger_mock,
+                            with(:logger => @logger_stub,
                                  :opts   => options).
                             and_return @config_mock
     Heirloom::Archive.should_receive(:new).

data/spec/cli/list_spec.rb

@@ -10,7 +10,9 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_mock, 
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub

data/spec/cli/shared_spec.rb

@@ -4,44 +4,57 @@ require 'heirloom/cli'
 
 describe Heirloom do
 
-  context "testing valid_options?" do
+  context "testing ensure_valid_options" do
 
     before do
+      @config_mock = mock 'config'
       @logger_mock = mock 'logger' 
+      @config_mock.stub :logger     => @logger_mock, 
+                        :access_key => 'key',
+                        :secret_key => 'secret'
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
     end
 
     it "should return false if a required array is emtpy" do
       @logger_mock.should_receive(:error)
-      @object.valid_options?(:provided => { :array  => [],
-                                            :string => 'present' },
-                             :required => [:array, :string],
-                             :logger   => @logger_mock).should be_false
+      lambda { @object.ensure_valid_options(:provided => { 
+                                              :array  => [],
+                                              :string => 'present' 
+                                            },
+                                            :required => [:array, :string],
+                                            :config   => @config_mock) }.
+                       should raise_error SystemExit
     end
 
     it "should return false if a required string is nil" do
       @logger_mock.should_receive(:error)
-      @object.valid_options?(:provided => { :array  => ['present'],
-                                            :string => nil },
-                             :required => [:array, :string],
-                             :logger   => @logger_mock).should be_false
+      lambda { @object.ensure_valid_options(:provided => { 
+                                              :array  => ['present'],
+                                              :string => nil 
+                                            },
+                                            :required => [:array, :string],
+                                            :config   => @config_mock) }.
+                       should raise_error SystemExit
     end
 
     it "should return false if a require string is nil & array is empty" do
       @logger_mock.should_receive(:error).exactly(2).times
-      @object.valid_options?(:provided => { :array  => [],
-                                            :string => nil },
-                             :required => [:array, :string],
-                             :logger   => @logger_mock).should be_false
+      lambda { @object.ensure_valid_options(:provided => { 
+                                              :array  => [],
+                                              :string => nil 
+                                            },
+                                            :required => [:array, :string],
+                                            :config   => @config_mock) }.
+                       should raise_error SystemExit
     end
 
     it "should return true if all options are present" do
       @logger_mock.should_receive(:error).exactly(0).times
-      @object.valid_options?(:provided => { :array  => ['present'],
+      @object.ensure_valid_options(:provided => { :array  => ['present'],
                                             :string => 'present' },
                              :required => [:array, :string],
-                             :logger   => @logger_mock).should be_true
+                             :config   => @config_mock)
     end
   end
 

data/spec/cli/show_spec.rb

@@ -10,7 +10,9 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_stub, 
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub

data/spec/cli/update_spec.rb

@@ -12,7 +12,9 @@ describe Heirloom do
     @logger_stub = stub :debug => true
     @config_mock = mock 'config'
     @archive_mock = mock 'archive'
-    @config_mock.stub :logger => @logger_mock
+    @config_mock.stub :logger     => @logger_stub, 
+                      :access_key => 'key',
+                      :secret_key => 'secret'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
                              and_return @logger_stub

data/spec/config_spec.rb

@@ -21,6 +21,7 @@ describe Heirloom do
   end
 
   it "should create a new config object and read from ~/.heirloom.yml" do
+    File.should_receive(:exists?).and_return true
     File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
                                and_return(@config.to_yaml)
     config = Heirloom::Config.new
@@ -36,5 +37,12 @@ describe Heirloom do
     config.primary_region.should == 'us-west-1'
   end
 
+  it "should load a blank config if the file does not exist and no config passed" do
+    File.should_receive(:exists?).and_return false
+    config = Heirloom::Config.new
+    config.access_key.should be_nil
+    config.secret_key.should be_nil
+    config.primary_region.should == 'us-west-1'
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.4.1rc1
+  version: 0.5.0rc1
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189313530340 !ruby/object:Gem::Requirement
+  requirement: &70238839864540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189313530340
+  version_requirements: *70238839864540
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70189313529180 !ruby/object:Gem::Requirement
+  requirement: &70238839863940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189313529180
+  version_requirements: *70238839863940
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70189313528440 !ruby/object:Gem::Requirement
+  requirement: &70238839863260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189313528440
+  version_requirements: *70238839863260
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70189313527540 !ruby/object:Gem::Requirement
+  requirement: &70238839862320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189313527540
+  version_requirements: *70238839862320
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70189313526840 !ruby/object:Gem::Requirement
+  requirement: &70238839861680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189313526840
+  version_requirements: *70238839861680
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3075151930949687714
+      hash: 911003878403684883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: