tango 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tango (0.0.7)
+    tango (0.0.8)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -111,6 +111,14 @@ Useful Helper Methods
       end
     end
 
+### Fetching a Remote URL
+
+    step "..." do
+      cd "/tmp" do
+        fetch "http://example.com/something.tar.gz"
+      end
+    end
+
 Copyright
 ---------
 

data/lib/tango/config_files.rb

@@ -1,12 +1,14 @@
 require 'erb'
+require 'fileutils'
 
 module Tango
   module ConfigFiles
 
-    def write(path, contents)
+    def write(path, contents, permissions = nil)
       contents = unindent(contents)
       contents = ERB.new(contents).result(binding)
       File.open(path, "w") {|file| file.write(contents) }
+      FileUtils.chmod(permissions, path) if permissions
     end
 
   private

data/lib/tango/fetch.rb

@@ -0,0 +1,9 @@
+module Tango
+  module Fetch
+
+    def fetch(url)
+      shell("wget", "--progress=bar:force", "--continue", url)
+    end
+
+  end
+end

data/lib/tango/met_and_meet.rb

@@ -9,14 +9,18 @@ module Tango
     end
 
     def meet(&meet_block)
-      raise MeetWithoutMetError if @met_block.nil?
+      # Cache the met block in case something inside the meet
+      # block calls another step with another met block:
+      met_block = @met_block
 
-      if instance_eval(&@met_block)
+      raise MeetWithoutMetError if met_block.nil?
+
+      if instance_eval(&met_block)
         log "already met."
       else
         log "not already met."
         instance_eval(&meet_block)
-        if instance_eval(&@met_block)
+        if instance_eval(&met_block)
           log "met."
         else
           raise CouldNotMeetError

data/lib/tango/runner.rb

@@ -1,6 +1,7 @@
 require 'tango/as_user'
 require 'tango/config_files'
 require 'tango/delegate'
+require 'tango/fetch'
 require 'tango/met_and_meet'
 require 'tango/shell'
 require 'tango/working_directory'
@@ -10,6 +11,7 @@ module Tango
     include AsUser
     include ConfigFiles
     include Delegate
+    include Fetch
     include MetAndMeet
     include Shell
     include WorkingDirectory

data/lib/tango/version.rb

@@ -1,3 +1,3 @@
 module Tango
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/met_and_meet_spec.rb

@@ -69,6 +69,26 @@ module Tango
       end.should raise_error(MeetWithoutMetError)
     end
 
+    it "should not have met blocks trample on one another" do
+      klass = Class.new do
+        include MetAndMeet
+
+        def log(message); end
+
+        def a
+          met? { false }
+          meet { b }
+        end
+
+        def b
+          met? { @b_done }
+          meet { @b_done = true }
+        end
+      end
+
+      expect { klass.new.a }.should raise_error(CouldNotMeetError)
+    end
+
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tango
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +10:00
+date: 2011-04-13 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/tango/as_user.rb
 - lib/tango/config_files.rb
 - lib/tango/delegate.rb
+- lib/tango/fetch.rb
 - lib/tango/logger.rb
 - lib/tango/met_and_meet.rb
 - lib/tango/runner.rb