heirloom 0.2.0 → 0.3.0.rc1

data/spec/config_spec.rb

@@ -4,12 +4,9 @@ describe Heirloom do
 
   before do
     @config = { 'aws' => 
-                { 'access_key'              => 'key',
-                  'secret_key'              => 'secret',
-                  'regions'                 => ['us-west-1', 'us-west-2'],
-                  'bucket_prefix'           => 'prefix',
-                  'simpledb'               => true,
-                  'authorized_aws_accounts' => [ 'test1 @acct.com', 'test2@acct.com' ]
+                { 'access_key'     => 'key',
+                  'secret_key'     => 'secret',
+                  'primary_region' => 'us-west-2'
                 }
               }
   end
@@ -19,11 +16,7 @@ describe Heirloom do
                                   :logger => 'da-logger'
     config.access_key.should == @config['aws']['access_key']
     config.secret_key.should == @config['aws']['secret_key']
-    config.regions.should == @config['aws']['regions']
-    config.primary_region.should == 'us-west-1'
-    config.bucket_prefix.should == @config['aws']['bucket_prefix']
-    config.authorized_aws_accounts.should == @config['aws']['authorized_aws_accounts']
-    config.simpledb.should == true
+    config.primary_region.should == @config['aws']['primary_region']
     config.logger.should == 'da-logger'
   end
 
@@ -33,19 +26,15 @@ describe Heirloom do
     config = Heirloom::Config.new
     config.access_key.should == @config['aws']['access_key']
     config.secret_key.should == @config['aws']['secret_key']
-    config.regions.should == @config['aws']['regions']
-    config.primary_region.should == 'us-west-1'
-    config.bucket_prefix.should == @config['aws']['bucket_prefix']
-    config.simpledb.should == true
-    config.authorized_aws_accounts.should == @config['aws']['authorized_aws_accounts']
+    config.primary_region.should == @config['aws']['primary_region']
   end
 
-  it "should set simpledb to true by default" do
-    @config['aws']['simpledb'] = nil
-    File.should_receive(:open).with("#{ENV['HOME']}/.heirloom.yml").
-                               and_return(@config.to_yaml)
-    config = Heirloom::Config.new
-    config.simpledb.should == true
+  it "should set the primary region to us-west-1 if not present in config" do
+    @config['aws'] = {}
+    config = Heirloom::Config.new :config => @config,
+                                  :logger => 'da-logger'
+    config.primary_region.should == 'us-west-1'
   end
 
+
 end

data/spec/logger_spec.rb

@@ -5,7 +5,6 @@ describe Heirloom do
   it "should create a new logger object from the hash passed as :logger" do
     logger_mock = mock 'logger'
     logger_mock.should_receive(:info).with 'a message'
-    logger_mock.should_receive(:level=).with Logger::INFO
     logger = Heirloom::HeirloomLogger.new :logger => logger_mock
     logger.info 'a message'
   end
@@ -14,16 +13,11 @@ describe Heirloom do
     logger_mock = mock 'logger'
     Logger.should_receive(:new).with(STDOUT).and_return logger_mock
     logger_mock.should_receive(:info).with 'a message'
-    logger_mock.should_receive(:level=).with Logger::INFO
+    logger_mock.should_receive(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
+    logger_mock.should_receive(:formatter=)
+    logger_mock.should_receive(:level=).with 1
     logger = Heirloom::HeirloomLogger.new
     logger.info 'a message'
   end
 
-  it "should set the log level to debug when passed in as log_level" do
-    logger_mock = mock 'logger'
-    Logger.should_receive(:new).with(STDOUT).and_return logger_mock
-    logger_mock.should_receive(:level=).with Logger::DEBUG
-    logger = Heirloom::HeirloomLogger.new :log_level => 'debug'
-  end
-
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152737644500 !ruby/object:Gem::Requirement
+  requirement: &70145117661200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152737644500
+  version_requirements: *70145117661200
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70152737643400 !ruby/object:Gem::Requirement
+  requirement: &70145117660720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152737643400
+  version_requirements: *70145117660720
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70152737657440 !ruby/object:Gem::Requirement
+  requirement: &70145117660280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152737657440
+  version_requirements: *70145117660280
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70152737654800 !ruby/object:Gem::Requirement
+  requirement: &70145117659840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152737654800
+  version_requirements: *70145117659840
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70152737651940 !ruby/object:Gem::Requirement
+  requirement: &70145117659380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152737651940
+  version_requirements: *70145117659380
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70152737666040 !ruby/object:Gem::Requirement
+  requirement: &70145117658940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152737666040
+  version_requirements: *70145117658940
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -112,10 +112,12 @@ files:
 - lib/heirloom/aws/s3.rb
 - lib/heirloom/aws/simpledb.rb
 - lib/heirloom/cli.rb
+- lib/heirloom/cli/authorize.rb
 - lib/heirloom/cli/build.rb
 - lib/heirloom/cli/destroy.rb
 - lib/heirloom/cli/download.rb
 - lib/heirloom/cli/list.rb
+- lib/heirloom/cli/shared.rb
 - lib/heirloom/cli/show.rb
 - lib/heirloom/cli/update.rb
 - lib/heirloom/config.rb
@@ -132,23 +134,24 @@ files:
 - lib/heirloom/version.rb
 - script/ci_setup
 - spec/acl/s3_spec.rb
+- spec/archive/authorizer_spec.rb
+- spec/archive/builder_spec.rb
+- spec/archive/destroyer_spec.rb
+- spec/archive/downloader_spec.rb
+- spec/archive/lister_spec.rb
+- spec/archive/reader_spec.rb
+- spec/archive/updater_spec.rb
+- spec/archive/uploader_spec.rb
+- spec/archive/verifier_spec.rb
+- spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- spec/cli/shared_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb
 - spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
-- spec/heirloom/authorizer_spec.rb
-- spec/heirloom/builder_spec.rb
-- spec/heirloom/destroyer_spec.rb
-- spec/heirloom/downloader_spec.rb
-- spec/heirloom/lister_spec.rb
-- spec/heirloom/reader_spec.rb
-- spec/heirloom/updater_spec.rb
-- spec/heirloom/uploader_spec.rb
-- spec/heirloom/verifier_spec.rb
-- spec/heirloom_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -165,16 +168,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2218051288322910577
+      hash: 3441427779404670971
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2218051288322910577
+      version: 1.3.1
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16
@@ -183,22 +183,23 @@ specification_version: 3
 summary: I help with deploying code into the cloud
 test_files:
 - spec/acl/s3_spec.rb
+- spec/archive/authorizer_spec.rb
+- spec/archive/builder_spec.rb
+- spec/archive/destroyer_spec.rb
+- spec/archive/downloader_spec.rb
+- spec/archive/lister_spec.rb
+- spec/archive/reader_spec.rb
+- spec/archive/updater_spec.rb
+- spec/archive/uploader_spec.rb
+- spec/archive/verifier_spec.rb
+- spec/archive_spec.rb
 - spec/aws/s3_spec.rb
 - spec/aws/simpledb_spec.rb
+- spec/cli/shared_spec.rb
 - spec/config_spec.rb
 - spec/destroyer/s3_spec.rb
 - spec/directory/directory_spec.rb
 - spec/directory/git_directory_spec.rb
 - spec/downloader/s3_spec.rb
-- spec/heirloom/authorizer_spec.rb
-- spec/heirloom/builder_spec.rb
-- spec/heirloom/destroyer_spec.rb
-- spec/heirloom/downloader_spec.rb
-- spec/heirloom/lister_spec.rb
-- spec/heirloom/reader_spec.rb
-- spec/heirloom/updater_spec.rb
-- spec/heirloom/uploader_spec.rb
-- spec/heirloom/verifier_spec.rb
-- spec/heirloom_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb

data/spec/heirloom/updater_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Heirloom do
-
-  before do
-    @config_mock = double 'config'
-    @logger_mock = double 'logger'
-    @config_mock.should_receive(:logger).and_return(@logger_mock)
-    @reader = Heirloom::Updater.new :config => @config_mock,
-                                    :name   => 'tim',
-                                    :id     => '123'
-  end
-
-  it "should test the archive updater methods"
-
-end

data/spec/heirloom/uploader_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Heirloom do
-
-  before do
-    @config_mock = double 'config'
-    @logger_mock = double 'logger'
-    @config_mock.should_receive(:logger).and_return(@logger_mock)
-    @reader = Heirloom::Uploader.new :config => @config_mock,
-                                     :name   => 'tim',
-                                     :id     => '123'
-  end
-
-  it "should test the archive uploader methods"
-
-end

data/spec/heirloom_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe Heirloom do
-
-    before do
-      Heirloom::Config.should_receive(:new).and_return('config')
-      @heirloom = Heirloom::Archive.new :logger => 'logger',
-                                        :name   => 'tim',
-                                        :id     => '123'
-    end
-
-
-    context "test public methods" do
-      before do
-        @mock = double('Mock')
-      end
-
-      it "should call build method with given args" do
-        @heirloom.should_receive(:builder).and_return(@mock)
-        @mock.should_receive(:build).with('args')
-        @heirloom.build('args')
-      end
-
-      it "should call download method with given args" do
-        @heirloom.should_receive(:downloader).and_return(@mock)
-        @mock.should_receive(:download).with('args')
-        @heirloom.download('args')
-      end
-
-      it "should call update heirloom method with given args" do
-        @heirloom.should_receive(:updater).and_return(@mock)
-        @mock.should_receive(:update).with('args')
-        @heirloom.update('args')
-      end
-
-      it "should call upload heirloom method with given args" do
-        @heirloom.should_receive(:uploader).and_return(@mock)
-        @mock.should_receive(:upload).with('args')
-        @heirloom.upload('args')
-      end
-
-      it "should call authorize method" do
-        @heirloom.should_receive(:authorizer).and_return(@mock)
-        @mock.should_receive(:authorize)
-        @heirloom.authorize
-      end
-
-      it "should call heirloom exists method" do
-        @heirloom.should_receive(:reader).and_return(@mock)
-        @mock.should_receive(:exists?)
-        @heirloom.exists?
-      end
-
-      it "should call show method" do
-        @heirloom.should_receive(:reader).and_return(@mock)
-        @mock.should_receive(:show)
-        @heirloom.show
-      end
-
-      it "should call list method" do
-        @heirloom.should_receive(:lister).and_return(@mock)
-        @mock.should_receive(:list)
-        @heirloom.list
-      end
-
-      it "should call cleanup method" do
-        @heirloom.should_receive(:builder).and_return(@mock)
-        @mock.should_receive(:cleanup)
-        @heirloom.cleanup
-      end
-
-    end
-
-end