rubycut-babushka 0.10.8 → 0.15.6.1

data/spec/babushka/ip_spec.rb

@@ -8,8 +8,8 @@ describe "IP" do
   end
   it "should work for valid IPs" do
     [
-      '10.0.1.1'      ,
-      '192.168.0.1'   ,
+      '10.0.1.1',
+      '192.168.0.1',
       '174.129.110.43'
     ].each {|string|
       IP.new(string).should be_valid
@@ -17,10 +17,10 @@ describe "IP" do
   end
   it "should work for invalid IPs" do
     [
-      '10.0.1.'        ,
-      '.10.0.1'        ,
-      '192.168.0'      ,
-      '192.168.0.c'    ,
+      '10.0.1.',
+      '.10.0.1',
+      '192.168.0',
+      '192.168.0.c',
       '174.129.110.433'
     ].each {|string|
       IP.new(string).should_not be_valid
@@ -54,8 +54,8 @@ end
 describe "IPRange" do
   it "should work for valid IPs" do
     [
-      '10.0.1.x'   ,
-      '10.0.x'     ,
+      '10.0.1.x',
+      '10.0.x',
       '174.129.x.x'
     ].each {|string|
       IPRange.new(string).should be_valid
@@ -63,9 +63,9 @@ describe "IPRange" do
   end
   it "should work for invalid IPs" do
     [
-      '10.0.1.1'    ,
-      '10.0.x.1'    ,
-      '10.0.x.'     ,
+      '10.0.1.1',
+      '10.0.x.1',
+      '10.0.x.',
       '174.129.110.',
       '174.129.x.43'
     ].each {|string|

data/spec/babushka/lambda_chooser_spec.rb

@@ -12,14 +12,8 @@ describe "lambda choosing" do
     LambdaChooser.new(nil, :ours, :theirs) {
       on :ours, "this is ours"
       on :theirs, "this is theirs"
+      "block value should be ignored"
     }.choose(:ours, :on).should == ["this is ours"]
-    describe "with a block value" do
-      LambdaChooser.new(nil, :ours, :theirs) {
-        on :ours, "this is ours"
-        on :theirs, "this is theirs"
-        "block value"
-      }.choose(:ours, :on).should == ["this is ours"]
-    end
   end
 
   it "should pick the first choice from multiple choices" do
@@ -35,6 +29,30 @@ describe "lambda choosing" do
     }.choose([:ours, :yours], :on).should == ["this is ours"]
   end
 
+  context "with multiple targets" do
+    it "should choose the specified call" do
+      LambdaChooser.new(nil, :ours, :theirs, :yours) {
+        on :ours, "this is ours"
+        on [:theirs, :yours], "this is theirs or yours"
+        "block value should be ignored"
+      }.choose(:yours, :on).should == ["this is theirs or yours"]
+    end
+    it "should pick the first choice from multiple choices" do
+      LambdaChooser.new(nil, :ours, :yours, :theirs) {
+        on :ours, "this is ours"
+        on [:theirs, :yours], "this is theirs or yours"
+      }.choose([:ours, :yours], :on).should == ["this is ours"]
+      LambdaChooser.new(nil, :ours, :yours, :theirs) {
+        on :ours, "this is ours"
+        on [:theirs, :yours], "this is theirs or yours"
+      }.choose([:theirs, :ours], :on).should == ["this is theirs or yours"]
+      LambdaChooser.new(nil, :ours, :yours, :theirs) {
+        on :ours, "this is ours"
+        on [:theirs, :yours], "this is theirs or yours"
+      }.choose([:yours, :ours], :on).should == ["this is theirs or yours"]
+    end
+  end
+
   it "should reject :otherwise as a choice name" do
     L{
       LambdaChooser.new(nil, :ours, :yours, :otherwise)
@@ -59,7 +77,7 @@ describe "lambda choosing" do
   it "should not join lists from multiple choices" do
     LambdaChooser.new(
       nil,
-      :apt, :brew, :macports, :yum, :linux, :osx, :ubuntu, :debian, :osx, :karmic, :gutsy, :lucid, :intrepid, :dapper, :breezy, :jaunty, :feisty, :edgy, :warty, :hardy, :maverick, :hoary, :lenny, :snow_leopard, :panther, :tiger, :leopard
+      :apt, :brew, :yum, :linux, :osx, :ubuntu, :debian, :osx, :karmic, :gutsy, :lucid, :intrepid, :dapper, :breezy, :jaunty, :feisty, :edgy, :warty, :hardy, :maverick, :hoary, :lenny, :snow_leopard, :panther, :tiger, :leopard
     ) {
       on :maverick, %w[ruby ruby1.8-dev]
       on :apt, %w[ruby irb ruby1.8-dev libopenssl-ruby]
@@ -74,10 +92,20 @@ describe "lambda choosing" do
       on :ours, "this is ours"
       on :theirs, "this is theirs"
     }.choose(:ours).should == ["this is ours"]
+  end
+
+  it "should accept a custom choice method" do
+    LambdaChooser.new(nil, :ours, :theirs) {
+      via :ours, "this is ours"
+      via :theirs, "this is theirs"
+    }.choose(:ours, :via).should == ["this is ours"]
+  end
+
+  it "should still respond to #on when a custom method is passed" do
     LambdaChooser.new(nil, :ours, :theirs) {
       on :ours, "this is ours"
       on :theirs, "this is theirs"
-    }.choose(:ours, nil).should == ["this is ours"]
+    }.choose(:ours, :via).should == ["this is ours"]
   end
 
   it "should reject values and block together" do
@@ -112,4 +140,14 @@ describe "lambda choosing" do
       }.choose(:ours, :on).should == expected
     }
   end
+
+  it "should return DepRequirement input intact" do
+    LambdaChooser.new(nil, :ours, :theirs) {
+      on :ours, 'a dep'.with('an arg'), 'another dep'.with('another arg')
+    }.choose(:ours, :on).should == [
+      DepRequirement.new('a dep', ['an arg']),
+      DepRequirement.new('another dep', ['another arg'])
+    ]
+  end
+
 end

data/spec/babushka/parameter_spec.rb

@@ -22,6 +22,15 @@ describe Parameter do
     end
   end
 
+  describe '#current_value' do
+    it "should return the value when the parameter is set" do
+      Parameter.for(:value, 'a value').current_value.should == 'a value'
+    end
+    it "should return nil when the parameter is unset" do
+      Parameter.for(:value).current_value.should be_nil
+    end
+  end
+
   describe "#==" do
     it "should behave like a string when it's set" do
       Parameter.new(:test, "a value").should == "a value"
@@ -45,6 +54,15 @@ describe Parameter do
     end
   end
 
+  describe "#to_a" do
+    it "should delegate to the value" do
+      Parameter.new(:test, %w[a value]).to_a.should == %w[a value]
+    end
+    it "should convert non-array values to arrays" do
+      Parameter.new(:test, 1..3).to_a.should == [1, 2, 3]
+    end
+  end
+
   describe "#to_str" do
     it "should delegate to the value" do
       File.exists?(Parameter.new(:path, "/bin")).should be_true
@@ -102,6 +120,9 @@ describe Parameter do
     it "should take precedence over default values" do
       Parameter.new(:unset).default!('default!').default('default').to_s.should == 'default!'
     end
+    it "should not set the parameter when returned" do
+      Parameter.new(:unset).default!('default!').tap(&:to_s).should_not be_set
+    end
   end
 
   describe "asking for values" do

data/spec/babushka/path_checker_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe PathChecker do
+  describe '.match_potential_versions' do
+    it "should extract a single version" do
+      PathChecker.match_potential_versions('0.13.2').should == ['0.13.2']
+    end
+    it "should extract multiple versions" do
+      PathChecker.match_potential_versions('0.13.2 9.1.3').should == ['0.13.2', '9.1.3']
+    end
+    it "should extract a version with a 'v' prefix" do
+      PathChecker.match_potential_versions('app v0.1.2').should == ['v0.1.2']
+    end
+    it "should work for babushka" do
+      PathChecker.match_potential_versions('0.13.2 (f177e22)').should == ['0.13.2', 'f177e22']
+    end
+    it "should work for postgres" do
+      PathChecker.match_potential_versions('psql (PostgreSQL) 9.1.3
+contains support for command-line editing').should == ['9.1.3']
+    end
+    it "should match lots of things for ruby" do
+      PathChecker.match_potential_versions(
+        'ruby 1.9.3p194 (2012-04-20 revision 35410) [x86_64-darwin12.0.0]'
+      ).should == ['1.9.3p194', '2012-04-20', '35410', 'x86_64-darwin12.0.0']
+    end
+
+    context "when a dotted version is supplied" do
+      it "should only match against dotted potential versions" do
+        PathChecker.match_potential_versions(
+          'ruby 1.9.3p194 (2012-04-20 revision 35410) [x86_64-darwin12.0.0]', '1.9.3p0'
+        ).should == ['1.9.3p194', 'x86_64-darwin12.0.0']
+      end
+    end
+  end
+end

data/spec/babushka/path_helpers_spec.rb

@@ -1,23 +1,13 @@
 require 'spec_helper'
 
 describe "cd" do
-  before do
-    @tmp_dir = tmp_prefix
-    `mkdir -p '#{@tmp_dir}'`
-    @tmp_dir_2 = File.join(tmp_prefix, '2')
-    `mkdir -p '#{@tmp_dir_2}'`
-
-    @original_pwd = Dir.pwd
-
-    @nonexistent_dir = File.join(tmp_prefix, 'nonexistent')
-    Dir.rmdir(@nonexistent_dir) if File.directory?(@nonexistent_dir)
-  end
+  let!(:original_pwd) { Dir.pwd }
 
   it "should yield if no dir is given" do
     has_yielded = false
-    cd(nil) {|path|
+    PathHelpers.cd(nil) {|path|
       path.should be_an_instance_of(Fancypath)
-      Dir.pwd.should == @original_pwd
+      Dir.pwd.should == original_pwd
       has_yielded = true
     }
     has_yielded.should be_true
@@ -25,78 +15,89 @@ describe "cd" do
 
   it "should yield if no chdir is required" do
     has_yielded = false
-    cd(@original_pwd) {|path|
+    PathHelpers.cd(original_pwd) {|path|
       path.should be_an_instance_of(Fancypath)
-      Dir.pwd.should == @original_pwd
+      Dir.pwd.should == original_pwd
       has_yielded = true
     }
     has_yielded.should be_true
   end
   it "should change dir for the duration of the block" do
     has_yielded = false
-    cd(@tmp_dir) {
-      Dir.pwd.should == @tmp_dir
+    PathHelpers.cd(tmp_prefix) {
+      Dir.pwd.should == tmp_prefix
       has_yielded = true
     }
     has_yielded.should be_true
-    Dir.pwd.should == @original_pwd
+    Dir.pwd.should == original_pwd
   end
-  it "should work recursively" do
-    cd(@tmp_dir) {
-      Dir.pwd.should == @tmp_dir
-      cd(@tmp_dir_2) {
-        Dir.pwd.should == @tmp_dir_2
+  context "recursively" do
+    let(:tmp_subdir) { (tmp_prefix / '2').tap(&:mkdir) }
+    it "should work" do
+      has_yielded = false
+      PathHelpers.cd(tmp_prefix) {
+        Dir.pwd.should == tmp_prefix
+        PathHelpers.cd(tmp_subdir) {
+          Dir.pwd.should == tmp_subdir
+          has_yielded = true
+        }
+        Dir.pwd.should == tmp_prefix
       }
-      Dir.pwd.should == @tmp_dir
-    }
-    Dir.pwd.should == @original_pwd
-  end
-  it "should fail on nonexistent dirs" do
-    L{ cd(@nonexistent_dir) }.should raise_error(Errno::ENOENT)
+      has_yielded.should be_true
+      Dir.pwd.should == original_pwd
+    end
   end
-  it "should create nonexistent dirs if :create => true is specified" do
-    cd(@nonexistent_dir, :create => true) {
-      Dir.pwd.should == @nonexistent_dir
+  context "nonexistent dirs" do
+    let(:nonexistent_dir) {
+      (tmp_prefix / 'missing').tap(&:rm)
     }
-    Dir.pwd.should == @original_pwd
+    it "should fail" do
+      L{ PathHelpers.cd(nonexistent_dir) }.should raise_error(Errno::ENOENT)
+    end
+    context "when :create => true is specified" do
+      it "should create and cd" do
+        PathHelpers.cd(nonexistent_dir, :create => true) {
+          Dir.pwd.should == nonexistent_dir
+        }
+        Dir.pwd.should == original_pwd
+      end
+      after {
+        nonexistent_dir.rm
+      }
+    end
   end
-  after {
-    Dir.rmdir(@nonexistent_dir) if File.directory?(@nonexistent_dir)
-  }
 end
 
 describe "in_build_dir" do
-  before {
-    @original_pwd = Dir.pwd
-  }
+  let!(:original_pwd) { Dir.pwd }
+
   it "should change to the build dir with no args" do
-    in_build_dir {
+    PathHelpers.in_build_dir {
       Dir.pwd.should == "~/.babushka/build".p
     }
-    Dir.pwd.should == @original_pwd
+    Dir.pwd.should == original_pwd
   end
   it "should append the supplied path when supplied" do
-    in_build_dir "tmp" do
+    PathHelpers.in_build_dir "tmp" do
       Dir.pwd.should == "~/.babushka/build/tmp".p
     end
-    Dir.pwd.should == @original_pwd
+    Dir.pwd.should == original_pwd
   end
 end
 
 describe "in_download_dir" do
-  before {
-    @original_pwd = Dir.pwd
-  }
+  let!(:original_pwd) { Dir.pwd }
+
   it "should change to the download dir with no args" do
-    in_download_dir {
+    PathHelpers.in_download_dir {
       Dir.pwd.should == "~/.babushka/downloads".p
     }
-    Dir.pwd.should == @original_pwd
+    Dir.pwd.should == original_pwd
   end
   it "should append the supplied path when supplied" do
-    in_download_dir "tmp" do
+    PathHelpers.in_download_dir "tmp" do
       Dir.pwd.should == "~/.babushka/downloads/tmp".p
     end
-    Dir.pwd.should == @original_pwd
+    Dir.pwd.should == original_pwd
   end
 end

data/spec/babushka/prompt_spec.rb

@@ -149,14 +149,14 @@ describe Prompt, "#get_path" do
   describe "with nonexistent path" do
     it "should fail" do
       Prompt.should_receive(:log).with("path", {:newline => false})
-      Prompt.should_receive(:read_from_prompt).and_return((tmp_prefix / 'nonexistent').to_s)
+      Prompt.should_receive(:read_from_prompt).and_return((tmp_prefix / 'missing').to_s)
       Prompt.should_receive(:log).with("Doesn't exist, or not a directory. path", {:newline => false})
       Prompt.should_receive(:read_from_prompt).and_return(tmp_prefix)
       Prompt.get_path('path', :type => :path).should == tmp_prefix
     end
     it "should fail with a valid default" do
       Prompt.should_receive(:log).with("path [/tmp]", {:newline => false})
-      Prompt.should_receive(:read_from_prompt).and_return((tmp_prefix / 'nonexistent').to_s)
+      Prompt.should_receive(:read_from_prompt).and_return((tmp_prefix / 'missing').to_s)
       Prompt.should_receive(:log).with("Doesn't exist, or not a directory. path [/tmp]", {:newline => false})
       Prompt.should_receive(:read_from_prompt).and_return(tmp_prefix)
       Prompt.get_path('path', :type => :path, :default => '/tmp').should == tmp_prefix
@@ -177,8 +177,8 @@ describe "'y' input" do
   context "unintentional" do
     it "should ask for the value again with a custom log message" do
       Prompt.should_receive(:log).with("value", {:newline => false})
-      Prompt.should_receive(:read_from_prompt).and_return('y')
-      Prompt.should_receive(:log).with("Wait, do you mean the literal value 'y' [n]", {:newline => false})
+      Prompt.should_receive(:read_from_prompt).and_return('yes')
+      Prompt.should_receive(:log).with("Wait, do you mean the literal value 'yes' [n]", {:newline => false})
       Prompt.should_receive(:read_from_prompt).and_return('n')
       Prompt.should_receive(:log).with("Thought so :) Hit enter for the [default]. value", {:newline => false})
       Prompt.should_receive(:read_from_prompt).and_return('value')

data/spec/babushka/renderable_spec.rb

@@ -21,7 +21,7 @@ shared_examples_for 'renderable' do
       end
       context "after shitting up the file" do
         before {
-          shell "echo lulz >> #{subject.path}"
+          ShellHelpers.shell "echo lulz >> #{subject.path}"
         }
         it "should not be clean" do
           subject.should_not be_clean
@@ -40,18 +40,51 @@ shared_examples_for 'renderable' do
 end
 
 describe Renderable do
+  subject { Renderable.new(dest_file) }
+
+  describe '#source_sha' do
+    context "when the result doesn't exist" do
+      let(:dest_file) { tmp_prefix / 'missing.conf' }
+      it "should raise an error" do
+        L{ subject.source_sha }.should raise_error(Errno::ENOENT)
+      end
+    end
+    context "when the result is an empty file" do
+      let(:dest_file) {
+        (tmp_prefix / 'empty.conf').tap {|p| p.write "" }
+      }
+      it "should return nil" do
+        subject.source_sha.should == nil
+      end
+    end
+    context "when the result doesn't contain an Inkan seal" do
+      let(:dest_file) {
+        (tmp_prefix / 'empty.conf').tap {|p| p.write "Holy lols" }
+      }
+      it "should return nil" do
+        subject.source_sha.should == nil
+      end
+    end
+    context "when the result is a rendered file" do
+      let(:dest_file) {
+        (tmp_prefix / 'empty.conf').tap {|p| p.write "# Generated by babushka-0.10.5 at 2011-10-24 16:02:08 +1100, from 8af66582dbd74858c701fcdeabafca06798cafc2. 2d73ecb845d6459e6390ab6aabbac146a020c022" }
+      }
+      it "should return the correct sha" do
+        subject.source_sha.should == '8af66582dbd74858c701fcdeabafca06798cafc2'
+      end
+    end
+  end
+
   context "with a config file" do
     let(:source_file) { "spec/renderable/example.conf.erb" }
     let(:dest_file) { tmp_prefix / 'example.conf' }
     let(:content) { %r{root #{tmp_prefix};} }
-    subject { Renderable.new(dest_file) }
     it_should_behave_like 'renderable'
   end
   context "with an xml file" do
     let(:source_file) { "spec/renderable/xml_example.conf.erb" }
     let(:dest_file) { tmp_prefix / 'xml_example.conf' }
     let(:content) { %r{<key>Lol</key>} }
-    subject { Renderable.new(dest_file) }
     it_should_behave_like 'renderable'
     context "custom comment" do
       before { subject.render(source_file, :comment => '<!--', :comment_suffix => '-->') }
@@ -65,36 +98,36 @@ describe Renderable do
     let(:source_file) { "spec/renderable/example.sh" }
     let(:dest_file) { tmp_prefix / 'example.sh' }
     let(:content) { %r{babushka 'benhoskings:up to date.repo'} }
-    subject { Renderable.new(dest_file) }
     it_should_behave_like 'renderable'
   end
-  describe "binding handling" do
-    subject { Renderable.new(tmp_prefix / 'example.conf') }
-    context "when no explicit binding is passed" do
-      before {
-        subject.instance_eval {
-          def custom_renderable_path
-            "from implicit binding"
-          end
-        }
-        subject.render('spec/renderable/with_binding.conf.erb')
+end
+
+describe "binding handling" do
+  subject { Renderable.new(tmp_prefix / 'example.conf') }
+  context "when no explicit binding is passed" do
+    before {
+      subject.instance_eval {
+        def custom_renderable_path
+          "from implicit binding"
+        end
       }
-      it "should render using the implicit binding" do
-        (tmp_prefix / 'example.conf').read.should =~ /from implicit binding/
-      end
+      subject.render('spec/renderable/with_binding.conf.erb')
+    }
+    it "should render using the implicit binding" do
+      (tmp_prefix / 'example.conf').read.should =~ /from implicit binding/
     end
-    context "when an explicit binding is passed" do
-      before {
-        dep 'renderable binding spec' do
-          def custom_renderable_path
-            "from explicit binding"
-          end
+  end
+  context "when an explicit binding is passed" do
+    before {
+      dep 'renderable binding spec' do
+        def custom_renderable_path
+          "from explicit binding"
         end
-        subject.render('spec/renderable/with_binding.conf.erb', :context => Dep('renderable binding spec').context)
-      }
-      it "should render using the given binding" do
-        (tmp_prefix / 'example.conf').read.should =~ /from explicit binding/
-      end
+      end.met?
+      subject.render('spec/renderable/with_binding.conf.erb', :context => Dep('renderable binding spec').context)
+    }
+    it "should render using the given binding" do
+      (tmp_prefix / 'example.conf').read.should =~ /from explicit binding/
     end
   end
 end