heirloom 0.12.1 → 0.12.2

data/spec/cipher/file_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe Heirloom do
   before do
-    @logger_mock = mock 'logger', :info => true
-    @logger_mock.stub :info  => true,
-                      :debug => true
-    @config_mock = mock 'config'
-    @config_mock.stub :logger => @logger_mock
-    @tempfile_stub = stub 'tempfile', :path   => '/path_to_encrypted_archive', 
-                                      :close! => true
-    Tempfile.stub :new => @tempfile_stub
-    @file = Heirloom::Cipher::File.new :config => @config_mock
+    @logger_double = double 'logger', :info => true
+    @logger_double.stub :info  => true,
+                        :debug => true
+    @config_double = double 'config'
+    @config_double.stub :logger => @logger_double
+    @tempfile_double = double 'tempfile', :path   => '/path_to_encrypted_archive', 
+                                          :close! => true
+    Tempfile.stub :new => @tempfile_double
+    @file = Heirloom::Cipher::File.new :config => @config_double
   end
 
   it "should encrypt the given file" do
@@ -26,14 +26,14 @@ describe Heirloom do
 
   it "should return false if gpg is not in the path" do
     @file.should_receive(:which).with('gpg').and_return false
-    @logger_mock.should_receive(:error)
+    @logger_double.should_receive(:error)
     @file.encrypt_file(:file   => '/file',
                        :secret => 'mysecret').should be_false
   end
 
   it "should return false if gpg returns non zero code" do
     @file.should_receive(:which).with('gpg').and_return true
-    @logger_mock.should_receive(:error)
+    @logger_double.should_receive(:error)
     command = 'gpg --batch --yes -c --cipher-algo AES256 --passphrase mysecret --output /path_to_encrypted_archive /file 2>&1'
     @file.should_receive(:`).with command
     $?.stub :success? => false

data/spec/cli/authorize_spec.rb

@@ -9,39 +9,39 @@ describe Heirloom do
                 :name            => 'archive_name',
                 :id              => '1.0.0',
                 :metadata_region => 'us-west-1' }
-    @logger_stub = stub 'logger', :error => true
-    @config_mock = mock_config :logger => @logger_stub
-    @archive_mock = mock 'archive'
+    @logger_double = double 'logger', :error => true
+    @config_double = double_config :logger => @logger_double
+    @archive_double = double 'archive'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_stub
+                             and_return @logger_double
     Heirloom::CLI::Authorize.any_instance.should_receive(:load_config).
-                             with(:logger => @logger_stub,
+                             with(:logger => @logger_double,
                                   :opts   => options).
-                             and_return @config_mock
+                             and_return @config_double
     Heirloom::Archive.should_receive(:new).
                       with(:name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
+                           :config => @config_double).
+                      and_return @archive_double
     Heirloom::Archive.should_receive(:new).
                       with(:id   => '1.0.0',
                            :name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
-    @archive_mock.stub :exists? => true
-    @archive_mock.should_receive(:domain_exists?).and_return true
+                           :config => @config_double).
+                      and_return @archive_double
+    @archive_double.stub :exists? => true
+    @archive_double.should_receive(:domain_exists?).and_return true
     @cli_authorize = Heirloom::CLI::Authorize.new
   end
 
   it "should authorize an account" do
-    @archive_mock.should_receive(:authorize).with(['test@test.com']).
-                  and_return true
+    @archive_double.should_receive(:authorize).with(['test@test.com']).
+                    and_return true
     @cli_authorize.authorize
   end
 
   it "should exit if authorize returns false" do
-    @archive_mock.should_receive(:authorize).with(['test@test.com']).
-                  and_return false
+    @archive_double.should_receive(:authorize).with(['test@test.com']).
+                    and_return false
     lambda { @cli_authorize.authorize }.should raise_error SystemExit
   end
 

data/spec/cli/catalog_spec.rb

@@ -6,53 +6,37 @@ describe Heirloom do
   before do
     @options = { :level           => 'info',
                  :metadata_region => 'us-west-1' }
-    @result = { 'heirloom_test' => 
+
+    @result = { 'heirloom_test' =>
                 { 'regions'       => ['us-west-1'],
                   'bucket_prefix' => ['bp'] } }
-    @logger_stub = stub :debug => true
-    @config_mock = mock_config :logger => @logger_stub
-    @catalog_mock = mock 'catalog'
-    @catalog_mock.stub :catalog_domain_exists? => true
+    @logger_double = double :debug => true
+    @config_double = double_config :logger => @logger_double
+    @catalog_double = double 'catalog'
+    @catalog_double.stub :catalog_domain_exists? => true
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_stub
+                             and_return @logger_double
     Heirloom::CLI::Catalog.any_instance.should_receive(:load_config).
-                           with(:logger => @logger_stub,
+                           with(:logger => @logger_double,
                                 :opts   => @options).
-                           and_return @config_mock
+                           and_return @config_double
     Heirloom::Catalog.should_receive(:new).
-                      with(:config => @config_mock).
-                      and_return @catalog_mock
-  end
-
-  context "as json" do
-    before do
-      @options[:json] = true
-      Trollop.stub :options => @options
-    end
-
-    it "should list the details about all heirlooms in the catalog" do
-      @cli_catalog = Heirloom::CLI::Catalog.new
-      @catalog_mock.stub :all => @result
-      formated_result = { 'test' => 
-                          { 'regions'       => ['us-west-1'],
-                            'bucket_prefix' => ['bp'] } }
-      @cli_catalog.should_receive(:jj).with formated_result
-      @cli_catalog.all
-    end
+                      with(:config => @config_double).
+                      and_return @catalog_double
   end
 
   context "as human readable" do
     before do
-      @options[:json] = nil
       Trollop.stub :options => @options
     end
 
     it "should list all heirlooms in the catalog" do
       @cli_catalog = Heirloom::CLI::Catalog.new
-      @catalog_mock.stub :all => @result
-      formatter_mock = mock 'formatter'
-      catalog = { :catalog =>
-                  { "test" =>
+      @catalog_double.stub :all => @result
+      formatter_double = double 'formatter'
+      catalog = { :region  => "us-west-1",
+                  :catalog =>
+                  { "heirloom_test" =>
                     {
                       "regions"       => ["us-west-1"], 
                       "bucket_prefix" => ["bp"] 
@@ -60,8 +44,8 @@ describe Heirloom do
                   },
                   :name => nil
                 }
-      Heirloom::CLI::Formatter::Catalog.stub :new => formatter_mock
-      formatter_mock.should_receive(:format).with(catalog).and_return 'theoutput'
+      Heirloom::CLI::Formatter::Catalog.stub :new => formatter_double
+      formatter_double.should_receive(:summary_format).with(:region=>"us-west-1").and_return('theoutput')
       @cli_catalog.should_receive(:puts).with 'theoutput'
       @cli_catalog.all
     end

data/spec/cli/destroy_spec.rb

@@ -8,32 +8,32 @@ describe Heirloom do
                 :id              => '1.0.0',
                 :level           => 'info',
                 :metadata_region => 'us-west-1' }
-    @logger_stub = stub 'logger'
-    @config_mock = mock_config :logger => @logger_stub
-    @archive_mock = mock 'archive'
+    @logger_double = double 'logger'
+    @config_double = double_config :logger => @logger_double
+    @archive_double = double 'archive'
     Trollop.stub(:options).and_return options
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_stub
+                             and_return @logger_double
     Heirloom::CLI::Destroy.any_instance.should_receive(:load_config).
-                             with(:logger => @logger_stub,
+                             with(:logger => @logger_double,
                                   :opts   => options).
-                             and_return @config_mock
+                             and_return @config_double
     Heirloom::Archive.should_receive(:new).
                       with(:name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
+                           :config => @config_double).
+                      and_return @archive_double
     Heirloom::Archive.should_receive(:new).
                       with(:id   => '1.0.0',
                            :name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
-    @archive_mock.stub :exists? => true
-    @archive_mock.should_receive(:domain_exists?).and_return true
+                           :config => @config_double).
+                      and_return @archive_double
+    @archive_double.stub :exists? => true
+    @archive_double.should_receive(:domain_exists?).and_return true
     @cli_destroy = Heirloom::CLI::Destroy.new
   end
 
   it "should destroy an archive" do
-    @archive_mock.should_receive(:destroy)
+    @archive_double.should_receive(:destroy)
     @cli_destroy.destroy
   end
 

data/spec/cli/download_spec.rb

@@ -4,17 +4,17 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    @logger_stub = stub 'logger'
-    @config_mock = mock_config :logger => @logger_stub
-    @archive_mock = mock 'archive'
+    @logger_double = double 'logger'
+    @config_double = double_config :logger => @logger_double
+    @archive_double = double 'archive'
     Heirloom::HeirloomLogger.should_receive(:new).
                              with(:log_level => 'info').
-                             and_return @logger_stub
+                             and_return @logger_double
     Heirloom::Archive.should_receive(:new).
-                      with(:id   => '1.0.0',
-                           :name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
+                      with(:id     => '1.0.0',
+                           :name   => 'archive_name',
+                           :config => @config_double).
+                      and_return @archive_double
   end
 
   context "with id, region and bucket_prefix specified" do
@@ -29,25 +29,25 @@ describe Heirloom do
                   :metadata_region => 'us-west-1' }
       Trollop.stub(:options).and_return options
       Heirloom::CLI::Download.any_instance.should_receive(:load_config).
-                              with(:logger => @logger_stub,
+                              with(:logger => @logger_double,
                                    :opts   => options).
-                              and_return @config_mock
+                              and_return @config_double
       @cli_download = Heirloom::CLI::Download.new
     end
 
     it "should download an archive" do
-      @archive_mock.should_receive(:download).with(:output        => '/tmp/test123',
-                                                   :region        => 'us-east-1',
-                                                   :bucket_prefix => 'bp',
-                                                   :extract     => false,
-                                                   :secret      => nil).
+      @archive_double.should_receive(:download).with(:output        => '/tmp/test123',
+                                                     :region        => 'us-east-1',
+                                                     :bucket_prefix => 'bp',
+                                                     :extract     => false,
+                                                     :secret      => nil).
                     and_return '/tmp/test123'
       @cli_download.should_receive(:ensure_path_is_directory).
-                    with(:config => @config_mock, 
+                    with(:config => @config_double,
                          :path => '/tmp/test123').
                     and_return true
       @cli_download.should_receive(:ensure_directory_is_writable).
-                    with(:config => @config_mock,
+                    with(:config => @config_double,
                          :path => '/tmp/test123').
                     and_return true
       @cli_download.download
@@ -56,9 +56,9 @@ describe Heirloom do
 
   context "id, region and bucket prefix not specified" do
     before do
-      @catalog_stub = stub 'catalog', :regions       => ['us-east-1', 'us-west-1'],
-                                      :bucket_prefix => 'bp'
-      @archive_mock.stub :exists? => true
+      @catalog_double = double 'catalog', :regions       => ['us-east-1', 'us-west-1'],
+                                          :bucket_prefix => 'bp'
+      @archive_double.stub :exists? => true
       options = { :name            => 'archive_name',
                   :level           => 'info',
                   :output          => '/tmp/test123',
@@ -67,34 +67,34 @@ describe Heirloom do
                   :metadata_region => 'us-west-1' }
       Trollop.stub(:options).and_return options
       Heirloom::CLI::Download.any_instance.should_receive(:load_config).
-                              with(:logger => @logger_stub,
+                              with(:logger => @logger_double,
                                    :opts   => options).
-                              and_return @config_mock
+                              and_return @config_double
       Heirloom::Catalog.should_receive(:new).
                         with(:name   => 'archive_name',
-                             :config => @config_mock).
-                        and_return @catalog_stub
-      archive_stub_to_lookup_latest = stub 'latest', :list => ['1.0.0']
+                             :config => @config_double).
+                        and_return @catalog_double
+      archive_double_to_lookup_latest = double 'latest', :list => ['1.0.0']
       Heirloom::Archive.should_receive(:new).
                         with(:name => 'archive_name',
-                             :config => @config_mock).
-                        and_return archive_stub_to_lookup_latest
+                             :config => @config_double).
+                        and_return archive_double_to_lookup_latest
       @cli_download = Heirloom::CLI::Download.new
     end
 
     it "should download the latest archive from the first region" do
-      @archive_mock.should_receive(:download).with(:output        => '/tmp/test123',
+      @archive_double.should_receive(:download).with(:output        => '/tmp/test123',
                                                    :region        => 'us-east-1',
                                                    :bucket_prefix => 'bp',
                                                    :extract       => false,
                                                    :secret        => nil).
-                    and_return '/tmp/test123'
+                      and_return '/tmp/test123'
       @cli_download.should_receive(:ensure_path_is_directory).
-                    with(:config => @config_mock, 
+                    with(:config => @config_double,
                          :path => '/tmp/test123').
                     and_return true
       @cli_download.should_receive(:ensure_directory_is_writable).
-                    with(:config => @config_mock,
+                    with(:config => @config_double,
                          :path => '/tmp/test123').
                     and_return true
       @cli_download.download

data/spec/cli/formatter/catalog_spec.rb

@@ -4,39 +4,41 @@ require 'heirloom/cli'
 describe Heirloom do
 
   before do
-    @catalog = { 'test1' =>
+
+    @catalog = { 'heirloom_test1' =>
                    { 'regions'       => ['us-west-1', 'us-east-1'],
                      'bucket_prefix' => ['bp1'] },
-                 'test2' => 
+                 'heirloom_test2' =>
                    { 'regions'       => ['us-west-2'],
                      'bucket_prefix' => ['bp2'] }
                } 
-    @formatter = Heirloom::CLI::Formatter::Catalog.new
+    @formatter = Heirloom::CLI::Formatter::Catalog.new :catalog => @catalog
+
+
   end
 
   context "unfiltered" do
-    it "should return the formated list" do
-      @formatter.format(:catalog => @catalog,
+    it "should return the summary formatted list" do
+
+      @formatter.summary_format(:region  => 'us-west-1',
                         :details => nil,
-                        :name    => nil ).should == "test1\ntest2"
+                        :name    => nil ).should == "us-west-1\n  test1\n  test2"
     end
   end
 
   context "filtered" do
-    it "should return the name with details" do
+    it "should return the name with details when passed in the name and region" do
       format = "test1\n" +
-               "  regions          : us-west-1, us-east-1\n" +
-               "  bucket_prefix    : bp1\n" +
-               "  us-west-1-s3-url : s3://bp1-us-west-1/test1\n" +
-               "  us-east-1-s3-url : s3://bp1-us-east-1/test1"
-      @formatter.format(:catalog => @catalog,
+          "  metadata_region  : us-west-1\n" +
+          "  regions          : us-east-1, us-west-1\n" +
+          "  bucket_prefix    : bp1\n" +
+          "  us-east-1-s3-url : s3://bp1-us-east-1/test1\n" +
+          "  us-west-1-s3-url : s3://bp1-us-west-1/test1"
+
+      @formatter.detailed_format(:region  => 'us-west-1',
+                        :details => nil,
                         :name    => 'test1').should == format
-    end
 
-    it "should return not found if name does not exist in catalog" do
-      format = "Heirloom not_here not found in catalog."
-      @formatter.format(:catalog => @catalog,
-                        :name    => 'not_here').should == format
     end
   end
 

data/spec/cli/list_spec.rb

@@ -8,25 +8,25 @@ describe Heirloom do
                  :level           => 'info',
                  :metadata_region => 'us-west-1',
                  :count           => 100 }
-    @logger_stub = stub :debug => true
-    @config_mock = mock_config :logger => @logger_stub
-    @archive_mock = mock 'archive'
+    @logger_double = double :debug => true
+    @config_double = double_config :logger => @logger_double
+    @archive_double = double 'archive'
     Heirloom::HeirloomLogger.should_receive(:new).with(:log_level => 'info').
-                             and_return @logger_stub
+                             and_return @logger_double
     Heirloom::CLI::List.any_instance.should_receive(:load_config).
-                        with(:logger => @logger_stub,
+                        with(:logger => @logger_double,
                              :opts   => @options).
-                        and_return @config_mock
+                        and_return @config_double
     Heirloom::Archive.should_receive(:new).
                       with(:name => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
+                           :config => @config_double).
+                      and_return @archive_double
     Heirloom::Archive.should_receive(:new).
                       with(:name   => 'archive_name',
-                           :config => @config_mock).
-                      and_return @archive_mock
-    @archive_mock.should_receive(:domain_exists?).and_return true
-    @archive_mock.should_receive(:count)
+                           :config => @config_double).
+                      and_return @archive_double
+    @archive_double.should_receive(:domain_exists?).and_return true
+    @archive_double.should_receive(:count)
   end
 
   context "as json" do
@@ -37,7 +37,7 @@ describe Heirloom do
 
     it "should list ids for given archive" do
       @cli_list = Heirloom::CLI::List.new
-      @archive_mock.should_receive(:list).with(100).and_return(['1','2'])
+      @archive_double.should_receive(:list).with(100).and_return(['1','2'])
       @cli_list.should_receive(:jj).with ['1','2']
       @cli_list.list
     end
@@ -51,7 +51,7 @@ describe Heirloom do
 
     it "should list ids for given archive" do
       @cli_list = Heirloom::CLI::List.new
-      @archive_mock.should_receive(:list).with(100).and_return(['1','2'])
+      @archive_double.should_receive(:list).with(100).and_return(['1','2'])
       @cli_list.should_receive(:puts).with "1\n2"
       @cli_list.list
     end