heirloom 0.7.3 → 0.7.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.7.4:
+
+* Add support to read password from file
+
 ## v0.7.3:
 
 * Fix bug in latest_id method

data/lib/heirloom/cli/download.rb

@@ -33,12 +33,15 @@ module Heirloom
       
       def download
         ensure_directory :path => @opts[:output], :config => @config
-        ensure_valid_secret :secret => @opts[:secret], :config => @config
+        secret = read_secret :opts   => @opts,
+                             :config => @config
+        ensure_valid_secret :secret => secret, 
+                            :config => @config
         archive = @archive.download :output      => @opts[:output],
                                     :extract     => @opts[:extract],
-                                    :secret      => @opts[:secret],
                                     :region      => @region,
-                                    :base_prefix => @base
+                                    :base_prefix => @base,
+                                    :secret      => secret
         exit 1 unless archive
       end
 
@@ -73,6 +76,8 @@ EOS
           opt :region, "Region to download Heirloom.", :type    => :string,
                                                       :default => 'us-west-1'
           opt :secret, "Secret for ecrypted Heirloom.", :type => :string
+          opt :secret_file, "Read secret from file.", :type  => :string,
+                                                      :short => :none
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 

data/lib/heirloom/cli/shared.rb

@@ -175,6 +175,23 @@ module Heirloom
                               :config => args[:config]
         archive.list(1).first
       end
+
+      def read_secret(args)
+        opts   = args[:opts]
+        config = args[:config]
+        logger = config.logger
+
+        return nil unless opts[:secret] || opts[:secret_file]
+
+        return opts[:secret] if opts[:secret]
+
+        unless File.exists? opts[:secret_file]
+          logger.error "Unable to read #{opts[:secret_file]}."
+          exit 1
+        end
+
+        (File.read opts[:secret_file]).chomp
+      end
     end
   end
 end

data/lib/heirloom/cli/upload.rb

@@ -37,16 +37,19 @@ module Heirloom
                              :config  => @config
         ensure_directory :path   => @opts[:directory], 
                          :config => @config
-        ensure_valid_secret :secret => @opts[:secret], 
+
+        secret = read_secret :opts   => @opts,
+                             :config => @config
+        ensure_valid_secret :secret => secret,
                             :config => @config
 
         @archive.destroy if @archive.exists?
                           
-        build = @archive.build :base       => @base,
-                               :directory  => @opts[:directory],
-                               :exclude    => @opts[:exclude],
-                               :git        => @opts[:git],
-                               :secret     => @opts[:secret]
+        build = @archive.build :base      => @base,
+                               :directory => @opts[:directory],
+                               :exclude   => @opts[:exclude],
+                               :git       => @opts[:git],
+                               :secret    => secret
 
         unless build
           @logger.error "Build failed."
@@ -86,9 +89,11 @@ Can be specified multiple times.", :type  => :string, :multi => true
           opt :name, "Name of Heirloom.", :type => :string
           opt :public, "Set this Heirloom as public readable?"
           opt :secret, "Encrypt the Heirloom with given secret.", :type => :string
-          opt :aws_access_key, "AWS Access Key ID", :type => :string, 
+          opt :secret_file, "Read secret from file.", :type  => :string,
+                                                      :short => :none
+          opt :aws_access_key, "AWS Access Key ID", :type  => :string, 
                                                     :short => :none
-          opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
+          opt :aws_secret_key, "AWS Secret Access Key", :type  => :string, 
                                                         :short => :none
         end
       end

data/lib/heirloom/version.rb

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

data/spec/cli/shared_spec.rb

@@ -283,4 +283,38 @@ describe Heirloom do
 
   end
 
+  context "read secret from file" do
+    before do
+      @archive_mock = mock 'archive'
+      @logger_stub = stub 'logger', :error => true
+      @config_stub = stub 'config', :logger => @logger_stub
+      @options = { :config => @config_stub, :opts => {} }
+      @object = Object.new
+      @object.extend Heirloom::CLI::Shared
+    end
+
+    it "should exit if the file does not exist" do
+      @options[:opts][:secret_file] = '/bad/file'
+      File.stub :exists? => false
+      lambda { @object.read_secret @options }.
+                       should raise_error SystemExit
+    end
+
+    it "should return the contents of the file with newline removed" do
+      file_mock = mock 'file'
+      @options[:opts][:secret_file] = '/good/file'
+      File.stub :exists? => true
+      File.should_receive(:read).
+           with('/good/file').
+           and_return "the-password\n"
+      @object.read_secret(@options).
+              should == 'the-password'
+    end
+
+    it "should return the password specified as secret" do
+      @options[:opts][:secret] = 'the-password'
+      @object.read_secret(@options).should == 'the-password'
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70200792914460 !ruby/object:Gem::Requirement
+  requirement: &70113954151760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70200792914460
+  version_requirements: *70113954151760
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70200792913840 !ruby/object:Gem::Requirement
+  requirement: &70113954150340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200792913840
+  version_requirements: *70113954150340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70200792913160 !ruby/object:Gem::Requirement
+  requirement: &70113954149460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200792913160
+  version_requirements: *70113954149460
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70200792912620 !ruby/object:Gem::Requirement
+  requirement: &70113954148360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200792912620
+  version_requirements: *70113954148360
 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: 1261279561972462313
+      hash: 719472930190387548
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1261279561972462313
+      hash: 719472930190387548
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16