heirloom 0.12.1 → 0.12.2

data/spec/downloader/s3_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe Heirloom do
 
   before do
-    @s3_mock = mock 's3 mock'
-    Heirloom::AWS::S3.stub :new => @s3_mock
+    @s3_double = double 's3 mock'
+    Heirloom::AWS::S3.stub :new => @s3_double
 
-    @config_mock = double 'config'
-    @logger_mock = double 'logger'
-    @config_mock.stub :logger => @logger_mock
-    @s3 = Heirloom::Downloader::S3.new :config  => @config_mock,
+    @config_double = double 'config'
+    @logger_double = double 'logger'
+    @config_double.stub :logger => @logger_double
+    @s3 = Heirloom::Downloader::S3.new :config  => @config_double,
                                        :region  => 'us-west-1'
   end
 
   context "when succesful" do
     it "should download the specified file from s3" do
-      @s3_mock.should_receive(:get_object).
-               with('bucket', 'key_name').
-               and_return 'data'
+      @s3_double.should_receive(:get_object).
+                 with('bucket', 'key_name').
+                 and_return 'data'
       @s3.download_file(:key    => 'key_name',
                         :bucket => 'bucket').should == 'data' 
     end
@@ -26,23 +26,23 @@ describe Heirloom do
   context "when unsuccesful" do
     before do
       body = '<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>AccessDenied</Code><Message>Access Denied</Message><RequestId>7A737B6941146062</RequestId><HostId>8DlaCTOXO2aBxLnM2cZs+C8pQ2a5IDI/NQJRlPGRbPbBU2U1jH67i0zA376utqyR</HostId></Error>'
-      @response_stub = stub 'response', :body => body
+      @response_double = double 'response', :body => body
     end
 
     it "should return an error if the bucket not found" do
-      @logger_mock.should_receive(:error).with('Access Denied')
-      @s3_mock.should_receive(:get_object).
-               with('bucket', 'key_name').
-               and_raise Excon::Errors::Forbidden.new 'msg', 'req', @response_stub
+      @logger_double.should_receive(:error).with('Access Denied')
+      @s3_double.should_receive(:get_object).
+                 with('bucket', 'key_name').
+                 and_raise Excon::Errors::Forbidden.new 'msg', 'req', @response_double
       @s3.download_file(:key    => 'key_name',
                         :bucket => 'bucket').should be_false
     end
 
     it "should return an error if the object not found / forbidden" do
-      @logger_mock.should_receive(:error).with('Access Denied')
-      @s3_mock.should_receive(:get_object).
-               with('bucket', 'key_name').
-               and_raise Excon::Errors::NotFound.new 'msg', 'req', @response_stub
+      @logger_double.should_receive(:error).with('Access Denied')
+      @s3_double.should_receive(:get_object).
+                 with('bucket', 'key_name').
+                 and_raise Excon::Errors::NotFound.new 'msg', 'req', @response_double
       @s3.download_file(:key    => 'key_name',
                         :bucket => 'bucket').should be_false
     end

data/spec/logger_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 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 = Heirloom::HeirloomLogger.new :logger => logger_mock
+    logger_double = double 'logger'
+    logger_double.should_receive(:info).with 'a message'
+    logger = Heirloom::HeirloomLogger.new :logger => logger_double
     logger.info 'a message'
   end
 
   it "should create a new logger object when one is not passed" 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(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
-    logger_mock.should_receive(:formatter=)
-    logger_mock.should_receive(:level=).with 1
+    logger_double = double 'logger'
+    Logger.should_receive(:new).with($stdout).and_return logger_double
+    logger_double.should_receive(:info).with 'a message'
+    logger_double.should_receive(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
+    logger_double.should_receive(:formatter=)
+    logger_double.should_receive(:level=).with 1
     logger = Heirloom::HeirloomLogger.new
     logger.info 'a message'
   end

data/spec/spec_helper.rb

@@ -7,25 +7,21 @@ end if ENV["COVERAGE"]
 require 'hashie'
 require 'rubygems'
 require 'bundler/setup'
-require 'vcr'
 
 require 'heirloom'
 
-HEIRLOOM_INT_BP = ENV['HEIRLOOM_INTEGRATION_BUCKET_PREFIX']
-RUN_INTEGRATION_TESTS = HEIRLOOM_INT_BP && !HEIRLOOM_INT_BP.empty?
-
 module SpecHelpers
 
   def set_env_var(name,value)
     ENV.stub(:fetch).with(name, nil).and_return(value)
   end
 
-  def mock_log
-    mock 'log', :debug => true, :info => true, :warn => true, :error => true, :level= => true
+  def double_log
+    double 'log', :debug => true, :info => true, :warn => true, :error => true, :level= => true
   end
 
-  def mock_config(args = {})
-    args[:logger]          ||= mock_log
+  def double_config(args = {})
+    args[:logger]          ||= double_log
     args[:access_key]      ||= 'key'
     args[:secret_key]      ||= 'secret'
     args[:metadata_region] ||= 'us-west-1'
@@ -37,79 +33,7 @@ module SpecHelpers
 
 end
 
-module IntegrationHelpers
-  def integration_or_mock_config
-    if RUN_INTEGRATION_TESTS && File.exists?("#{ENV['HOME']}/.heirloom.yml")
-      begin
-        Heirloom::Config.new(:environment => 'integration', :logger => mock_log)
-      rescue SystemExit
-        mock_config
-      end
-    else
-      mock_config
-    end
-  end
-
-  def wait_for_aws(num_seconds = 5)
-    sleep num_seconds
-  end
-
-  def create_temp_heirloom_content
-    tmp_dir = Dir.mktmpdir
-    File.open(File.join(tmp_dir, 'index.html'), 'w') do |f|
-      f.write 'Hello World!'
-    end
-    tmp_dir
-  end
-
-  def reset_env(opts = {})
-    opts[:environment]     = 'integration'
-    opts[:log_level]       = 'debug'
-    opts[:metadata_region] = 'us-west-1'
-
-    Trollop.stub :options => opts
-  end
-
-  def capture(*streams)
-    streams.map! { |stream| stream.to_s }
-    begin
-      result = StringIO.new
-      streams.each { |stream| eval "$#{stream} = result" }
-      yield
-    ensure
-      streams.each { |stream| eval "$#{stream} = #{stream.upcase}" }
-    end
-    result.string
-  end
-
-end
-
-VCR.configure do |config|
-
-  config.allow_http_connections_when_no_cassette = true
-  config.cassette_library_dir = 'spec/fixtures/cassettes'
-  config.hook_into :excon
-  config.configure_rspec_metadata!
-
-  if RUN_INTEGRATION_TESTS
-    heirloom_integration_config = Heirloom::Config.new(:environment => 'integration')
-    config.filter_sensitive_data('<AWSACCESSKEYID>') do
-      heirloom_integration_config.access_key
-    end
-    config.filter_sensitive_data('<AWSSECRETKEY>') do
-      heirloom_integration_config.secret_key
-    end
-  end
-
-end
-
 RSpec.configure do |config|
   config.include SpecHelpers
-  config.include IntegrationHelpers
-
-  # https://www.relishapp.com/vcr/vcr/v/2-4-0/docs/test-frameworks/usage-with-rspec-metadata!
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
-  config.filter_run_excluding :integration => true unless ENV['HEIRLOOM_INTEGRATION_BUCKET_PREFIX']
 end
 

data/spec/uploader/s3_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Heirloom::Uploader::S3 do
   before do
-    @logger_stub = stub 'logger stub', :info  => true,
-                                       :warn  => true,
-                                       :debug => true
-    @config_stub = stub 'config stub', :logger => @logger_stub
-    @s3 = Heirloom::Uploader::S3.new :config => @config_stub,
-                                     :logger => @logger_stub,
+    @logger_double = double 'logger double', :info  => true,
+                                             :warn  => true,
+                                             :debug => true
+    @config_double = double 'config double', :logger => @logger_double
+    @s3 = Heirloom::Uploader::S3.new :config => @config_double,
+                                     :logger => @logger_double,
                                      :region => 'us-west-1'
   end
 
@@ -19,46 +19,46 @@ describe Heirloom::Uploader::S3 do
                  :key_folder      => 'key_folder',
                  :name            => 'name',
                  :public_readable => true }
-    @s3_mock     = mock 's3 mock'
-    @bucket_mock = mock 'bucket mock'
-    @files_mock  = mock 'files mock'
-    @file_mock   = mock 'file mock'
-    @body_mock   = mock 'body mock'
+    @s3_double     = double 's3 mock'
+    @bucket_double = double 'bucket mock'
+    @files_double  = double 'files mock'
+    @file_double   = double 'file mock'
+    @body_double   = double 'body mock'
     Heirloom::AWS::S3.should_receive(:new).
-                      with(:config => @config_stub,
+                      with(:config => @config_double,
                            :region => 'us-west-1').
-                      and_return @s3_mock
-    @s3_mock.should_receive(:get_bucket).
-             with('bucket').
-             and_return @bucket_mock
-    @bucket_mock.should_receive(:files).and_return(@files_mock)
-    File.should_receive(:open).with('file').and_return @body_mock
-    @files_mock.should_receive(:create).
-                with :key    => "key_folder/key_name",
-                     :body   => @body_mock,
-                     :public => true
-    @body_mock.should_receive(:close)
+                      and_return @s3_double
+    @s3_double.should_receive(:get_bucket).
+               with('bucket').
+               and_return @bucket_double
+    @bucket_double.should_receive(:files).and_return(@files_double)
+    File.should_receive(:open).with('file').and_return @body_double
+    @files_double.should_receive(:create).
+                  with :key    => "key_folder/key_name",
+                       :body   => @body_double,
+                       :public => true
+    @body_double.should_receive(:close)
     @s3.upload_file @options
   end
 
   it "should add endpoint attributes for the file to simpledb" do
-    simpledb_mock = mock 'simpledb mock'
+    simpledb_double = double 'simpledb mock'
     options = { :bucket          => 'bucket',
                 :id              => 'id',
                 :key_name        => 'key_name',
                 :name            => 'name' }
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return simpledb_mock
-    simpledb_mock.should_receive(:put_attributes).
-                  with("heirloom_name", "id", 
-                       { "us-west-1-s3-url" => "s3://bucket/name/key_name" } )
-    simpledb_mock.should_receive(:put_attributes).
-                  with("heirloom_name", "id", 
-                       { "us-west-1-http-url" => "http://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
-    simpledb_mock.should_receive(:put_attributes).
-                  with("heirloom_name", "id", 
-                       { "us-west-1-https-url" => "https://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
+                            with(:config => @config_double).
+                            and_return simpledb_double
+    simpledb_double.should_receive(:put_attributes).
+                    with("heirloom_name", "id",
+                         { "us-west-1-s3-url" => "s3://bucket/name/key_name" } )
+    simpledb_double.should_receive(:put_attributes).
+                    with("heirloom_name", "id",
+                         { "us-west-1-http-url" => "http://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
+    simpledb_double.should_receive(:put_attributes).
+                    with("heirloom_name", "id",
+                         { "us-west-1-https-url" => "https://s3-us-west-1.amazonaws.com/bucket/name/key_name" } )
     @s3.add_endpoint_attributes options
   end
 end

metadata

@@ -1,83 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-- !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +98,16 @@ dependencies:
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -145,10 +117,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -271,14 +243,11 @@ files:
 - spec/fixtures/cassettes/Heirloom_AWS_SimpleDB/select/should_yield_when_requested.yml
 - spec/fixtures/create_test_data.sh
 - spec/heirloom_spec.rb
-- spec/integration/authorize_spec.rb
-- spec/integration/cleanup_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/uploader/s3_spec.rb
 - spec/utils/email_spec.rb
 - spec/utils/file_spec.rb
-- watchr.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -288,17 +257,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: heirloom
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: I help with deploying code into the cloud
@@ -354,8 +323,6 @@ test_files:
 - spec/fixtures/cassettes/Heirloom_AWS_SimpleDB/select/should_yield_when_requested.yml
 - spec/fixtures/create_test_data.sh
 - spec/heirloom_spec.rb
-- spec/integration/authorize_spec.rb
-- spec/integration/cleanup_spec.rb
 - spec/logger_spec.rb
 - spec/spec_helper.rb
 - spec/uploader/s3_spec.rb