heirloom 0.7.3rc1 → 0.7.3rc2

data/lib/heirloom/cli/download.rb

@@ -17,10 +17,9 @@ module Heirloom
         @catalog = Heirloom::Catalog.new :name    => @opts[:name],
                                          :config  => @config
 
-        id = @opts.fetch(:id) do
-          latest_id :name   => @opts[:name],
-                    :config => @config
-        end
+        # Can't use fetch as Trollop sets :id to nil
+        id = @opts[:id] ||( latest_id :name   => @opts[:name],                                              
+                                      :config => @config)
 
         @archive = Archive.new :name   => @opts[:name],
                                :id     => id,

data/lib/heirloom/cli/show.rb

@@ -15,18 +15,18 @@ module Heirloom
                              :config   => @config
         ensure_valid_region :region => @opts[:metadata_region],
                             :config => @config
-        ensure_domain_exists :name => @opts[:name], :config => @config
+        ensure_domain_exists :name   => @opts[:name], 
+                             :config => @config
 
-        id = @opts.fetch(:id) do 
-          latest_id :name   => @opts[:name],
-                    :config => @config 
-        end
+        # Can't use fetch as Trollop sets :id to nil
+        id = @opts[:id] || (latest_id :name   => @opts[:name],
+                                      :config => @config)
 
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config,
                                :id     => id
         ensure_archive_exists :archive => @archive,
-                              :config => @config
+                              :config  => @config
       end
       
       def show

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.7.3rc1"
+  VERSION = "0.7.3rc2"
 end

data/spec/cli/download_spec.rb

@@ -62,6 +62,7 @@ describe Heirloom do
                   :level           => 'info',
                   :output          => '/tmp/test123',
                   :extract         => false,
+                  :id              => nil,
                   :metadata_region => 'us-west-1' }
       Trollop.stub(:options).and_return options
       Heirloom::CLI::Download.any_instance.should_receive(:load_config).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.7.3rc1
+  version: 0.7.3rc2
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334826226500 !ruby/object:Gem::Requirement
+  requirement: &70238785263620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334826226500
+  version_requirements: *70238785263620
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70334826225340 !ruby/object:Gem::Requirement
+  requirement: &70238785263000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334826225340
+  version_requirements: *70238785263000
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70334826224520 !ruby/object:Gem::Requirement
+  requirement: &70238785262400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334826224520
+  version_requirements: *70238785262400
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70334826223940 !ruby/object:Gem::Requirement
+  requirement: &70238785261760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334826223940
+  version_requirements: *70238785261760
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -654762167315470304
+      hash: 3878756890706526061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: