tango 0.0.5 → 0.0.6

data/Gemfile.lock

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

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2011 Envato & Pete Yandell.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.md

@@ -10,36 +10,70 @@ that really don't fit with the way we want to use it at
 of Babushka's fundamentals to try to find a better fit.
 
 
-Example
--------
+Bootstrapping Ubuntu
+--------------------
 
-    class Homebrew < Tango::Namespace
-      def installed?(formula)
-        shell("brew", "info", formula, :echo => false).output !~ /Not installed/
+    sudo apt-get install -y ruby irb rdoc
+
+    # Use the real rubygems, not the silly apt version. 
+    wget http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz
+    tar -zxvf rubygems-1.6.2.tgz
+    cd rubygems-1.6.2
+    sudo ruby setup.rb --no-format-executable
+
+    sudo gem install tango
+
+Example Runner
+--------------
+
+    class AptInstaller < Tango::Runner
+      def installed?(package)
+        shell("dpkg-query", "--status", package, :echo => false).output !~ /not.installed|deinstall/
       end
 
-      step "bootstrap" do
-        met? { shell("brew info").succeeded? }
-        meet { shell(%{ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"}) }
+      step "install" do |package|
+        met? { installed?(package) }
+        # Need to figure out how to make this non-interactive. See:
+        # http://ubuntuforums.org/showthread.php?t=1218525
+        meet { shell("apt-get", "install", "-y", package) }
+      end
+    end
+
+    class GemInstaller < Tango::Runner
+      def installed?(gem)
+        shell("gem", "query", "--installed", "--name-matches", gem, :echo => false).output =~ /true/
       end
 
-      step "install" do |formula|
-        met? { installed?(formula) }
-        meet { shell("brew, "install", formula) }
+      step "install" do |gem|
+        met? { installed?(gem) }
+        meet { shell("gem", "install", gem) }
       end
     end
 
-    class MyNamespace < Tango::Namespace
-      step "install" do
-        Homebrew.run "bootstrap"
-        Homebrew.run "install", "git"
-        Homebrew.run "install", "mysql"
-        run "install mtr"
+    class ExampleInstaller < Tango::Runner
+      def initialize
+        @apt = AptInstaller.new
+        @gem = GemInstaller.new
       end
 
-      step "install mtr" do
-        met? { Homebrew.installed?("mtr") }
-        meet { shell("brew install --no-gtk mtr") }
+      step "install" do
+        @apt.install "build-essential"
+
+        @apt.install "mysql-server"
+        @apt.install "libmysqlclient-dev"
+
+        @apt.install "git-core"
+
+        @gem.install "bundler"
       end
     end
 
+Running the Example
+-------------------
+
+    tango example_installer.rb ExampleInstaller.install
+
+Copyright
+---------
+
+Copyright © 2011 Envato &amp; Pete Yandell. See LICENSE for details.

data/bin/tango

@@ -7,4 +7,4 @@ load ARGV[0]
 
 namespace_name, step_name = ARGV[1].split(".")
 
-Object.const_get(namespace_name).run(step_name)
+Object.const_get(namespace_name).new.run(step_name)

data/lib/tango.rb

@@ -1,4 +1,2 @@
-require 'tango/as_user'
 require 'tango/logger'
-require 'tango/met_and_meet'
-require 'tango/namespace'
+require 'tango/runner'

data/lib/tango/delegate.rb

@@ -0,0 +1,24 @@
+module Tango
+  module Delegate
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def delegate(*methods)
+        options = methods.pop
+        methods.each do |method|
+          define_method(method) do |*args|
+            send(options[:to]).send(method, *args)
+          end
+        end
+      end
+
+    end
+
+  end
+end
+
+

data/lib/tango/runner.rb

@@ -0,0 +1,40 @@
+require 'tango/as_user'
+require 'tango/delegate'
+require 'tango/met_and_meet'
+require 'tango/shell'
+
+module Tango
+  class Runner
+    include AsUser
+    include Delegate
+    include MetAndMeet
+    include Shell
+    
+    def self.step(step_name, &block)
+      define_method(step_name) do |*args|
+        description = step_description(step_name, args)
+
+        logger.enter(description)
+        result = instance_exec(*args, &block)
+        logger.leave(description)
+
+        result
+      end
+    end
+
+    def step_description(step_name, args)
+      description = "#{self.class.name}.#{step_name}"
+      description << "(" + args.map {|arg| arg.inspect }.join(", ") + ")" unless args.empty?
+      description
+    end
+
+    alias_method :run, :send
+
+    delegate :log, :log_raw, :to => :logger
+
+    def logger
+      Logger.instance
+    end
+
+  end
+end

data/lib/tango/shell.rb

@@ -14,6 +14,8 @@ module Tango
       Process.waitpid(pid)
       pipe.close
 
+      log "" if options[:echo]
+
       OpenStruct.new(
         :output     => output,
         :status     => $?.exitstatus,

data/lib/tango/version.rb

@@ -1,3 +1,3 @@
 module Tango
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/{namespace_spec.rb → runner_spec.rb}

@@ -1,37 +1,37 @@
 require 'tango'
 
-class StubLogger
+class StubbedLogger
   def enter(name); end
   def leave(name); end
   def log(message); end
 end
 
-class StubbedNamespace < Tango::Namespace
-  def self.logger
-    @logger ||= StubLogger.new
+class StubbedRunner < Tango::Runner
+  def logger
+    @logger ||= StubbedLogger.new
   end
 end
 
 module Tango
-  describe Namespace do
+  describe Runner do
 
     it "should run a step" do
       step_run = false
 
-      namespace = Class.new(StubbedNamespace) do
+      runner = Class.new(StubbedRunner) do
         step "example step" do
           step_run = true
         end
       end
 
-      namespace.run "example step"
+      runner.new.run "example step"
       step_run.should be_true
     end
 
     it "should run one step from within another" do
       inner_step_run = false
 
-      namespace = Class.new(StubbedNamespace) do
+      runner = Class.new(StubbedRunner) do
         step "outer step" do
           run "inner step"
         end
@@ -41,24 +41,24 @@ module Tango
         end
       end
 
-      namespace.run "outer step"
+      runner.new.run "outer step"
       inner_step_run.should be_true
     end
 
     context "passing arguments" do
       it "should pass arguments to a step" do
-        namespace = Class.new(StubbedNamespace) do
+        runner = Class.new(StubbedRunner) do
           step "example step" do |a, b|
             a.should == 1
             b.should == 2
           end
         end
 
-        namespace.run "example step", 1, 2
+        runner.new.run "example step", 1, 2
       end
 
       it "should pass arguments when running other steps" do
-        namespace = Class.new(StubbedNamespace) do
+        runner = Class.new(StubbedRunner) do
           step "outer step" do
             run "inner step", 1, 2
           end
@@ -69,7 +69,7 @@ module Tango
           end
         end
 
-        namespace.run "outer step"
+        runner.new.run "outer step"
       end
     end
 

data/spec/shell_spec.rb

@@ -33,8 +33,9 @@ module Tango
 
     it "should echo the command and its output" do
       @stub = @stub_class.new
-      @stub.should_receive(:log).with("% echo Hello, world!\n\n")
-      @stub.should_receive(:log_raw).with("Hello, world!\n")
+      @stub.should_receive(:log).with("% echo Hello, world!\n\n").once.ordered
+      @stub.should_receive(:log_raw).with("Hello, world!\n").once.ordered
+      @stub.should_receive(:log).with("").once.ordered
 
       @stub.shell("echo", "Hello, world!")
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tango
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +11:00
+date: 2011-04-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,19 +46,21 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/tango
 - lib/tango.rb
 - lib/tango/as_user.rb
+- lib/tango/delegate.rb
 - lib/tango/logger.rb
 - lib/tango/met_and_meet.rb
-- lib/tango/namespace.rb
+- lib/tango/runner.rb
 - lib/tango/shell.rb
 - lib/tango/version.rb
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
-- spec/namespace_spec.rb
+- spec/runner_spec.rb
 - spec/shell_spec.rb
 - tango.gemspec
 has_rdoc: true
@@ -98,5 +100,5 @@ summary: Experiment in deployment tools.
 test_files: 
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
-- spec/namespace_spec.rb
+- spec/runner_spec.rb
 - spec/shell_spec.rb

data/lib/tango/namespace.rb

@@ -1,47 +0,0 @@
-require 'tango/as_user'
-require 'tango/met_and_meet'
-require 'tango/shell'
-
-module Tango
-  class Namespace
-    include AsUser
-    include MetAndMeet
-    include Shell
-    
-    def self.step(step_name, &block)
-      define_method(step_name, &block)
-    end
-
-    def self.run(step_name, *args)
-      description = "#{name}.#{step_name}"
-      description << "(" + args.map {|arg| arg.inspect }.join(", ") + ")" unless args.empty?
-
-      logger.enter(description)
-      new.send(step_name, *args)
-      logger.leave(description)
-    end
-
-    def run(step_name, *args)
-      self.class.run(step_name, *args)
-    end
-
-    def log(message)
-      self.class.logger.log(message)
-    end
-
-    def log_raw(message)
-      self.class.logger.log_raw(message)
-    end
-
-    def self.method_missing(method, *args)
-      new.send(method, *args)
-    end
-
-  private
-
-    def self.logger
-      Logger.instance
-    end
-
-  end
-end