cap-util 0.4.0 → 1.0.0.rc1

data/cap-util.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.description = %q{A set of utilities for writing cap tasks.}
   gem.summary     = %q{A set of utilities for writing cap tasks.}
 
-  gem.authors     = ["Kelly Redding"]
-  gem.email       = ["kelly@kellyredding.com"]
+  gem.authors     = ["Kelly Redding", "Collin Redding"]
+  gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
   gem.homepage    = "http://github.com/redding/cap-util"
 
   gem.files         = `git ls-files`.split("\n")
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert")
+  gem.add_development_dependency("assert", ["~>1.0"])
   gem.add_dependency("capistrano")
-  gem.add_dependency("scmd", ["~>1.1"])
+  gem.add_dependency("scmd", ["~>2.0"])
 
 end

data/lib/cap-util/halt.rb

@@ -1,11 +1,11 @@
 module CapUtil
 
-  class DeployHalted < RuntimeError
+  class Halted < RuntimeError
     def backtrace; []; end
   end
 
-  def self.halt(msg='deploy halted')
-    raise CapUtil::DeployHalted, color(msg, :bold, :yellow)
+  def self.halt(msg='halted')
+    raise CapUtil::Halted, color(msg, :bold, :yellow)
   end
 
   module Halt

data/lib/cap-util/run.rb

@@ -2,24 +2,29 @@ require 'scmd'
 
 module CapUtil
 
-  def self.run_locally(cmd_str)
-    cmd = Scmd.new(cmd_str)
+  class LocalCmdRunner
+    def initialize(cmd_str)
+      @cmd = Scmd.new(cmd_str)
+    end
 
-    say_bulleted "running `#{cmd}'"
-    cmd.run
-    say_error(cmd.stderr) if !cmd.success?
+    def run!(input=nil)
+      CapUtil.say_bulleted "running `#{@cmd}'"
+      @cmd.run(input)
 
-    cmd
+      if !@cmd.success?
+        CapUtil.say_error(@cmd.stderr)
+        CapUtil.halt
+      end
+      @cmd
+    end
   end
 
-  def self.run_locally_with_stdin(cmd_str, input)
-    cmd = Scmd.new(cmd_str)
-
-    say_bulleted "running `#{cmd}'"
-    cmd.run(input)
-    say_error(cmd.stderr) if !cmd.success?
+  def self.run_locally(cmd_str)
+    LocalCmdRunner.new(cmd_str).run!
+  end
 
-    cmd
+  def self.run_locally_with_stdin(cmd_str, input)
+    LocalCmdRunner.new(cmd_str).run!(input)
   end
 
   module Run

data/lib/cap-util/version.rb

@@ -1,3 +1,3 @@
 module CapUtil
-  VERSION = "0.4.0"
+  VERSION = "1.0.0.rc1"
 end

data/test/cap_util_tests.rb

@@ -18,8 +18,8 @@ module CapUtil
   class HaltTests < CapUtilTests
     desc "`halt` util methods"
 
-    should "raise a `DeployHalted` custom exception" do
-      assert_raises(CapUtil::DeployHalted) { subject.halt }
+    should "raise a `Halted` custom exception" do
+      assert_raises(CapUtil::Halted) { subject.halt }
     end
   end
 
@@ -49,10 +49,10 @@ module CapUtil
 
   end
 
-  class DeployHaltedTests < Assert::Context
-    desc "the CapUtility DeployHalted custome exception"
+  class HaltedTests < Assert::Context
+    desc "the CapUtil Halted custom exception"
     setup do
-      @err = CapUtil::DeployHalted.new
+      @err = CapUtil::Halted.new
     end
     subject { @err }
 

data/test/local_cmd_runner_tests.rb

@@ -0,0 +1,18 @@
+require 'assert'
+
+require 'cap-util/run'
+
+module CapUtil
+
+  class LocalCmdRunnerTests < Assert::Context
+    desc "the local cmd runner helper class"
+    setup do
+      @cmd_runner = LocalCmdRunner.new("echo hi")
+    end
+    subject { @cmd_runner }
+
+    should have_imeth :run!
+
+  end
+
+end

data/test/unset_var_tests.rb

@@ -16,15 +16,15 @@ module CapUtil
       assert_kind_of ::Proc, subject
     end
 
-    should "raise `DeployHalted` when called" do
-      assert_raises(CapUtil::DeployHalted) { subject.call }
+    should "raise `Halted` when called" do
+      assert_raises(CapUtil::Halted) { subject.call }
     end
 
     should "raise with a default msg based on the variable name" do
       exp_msg = ":#{@var_name} var not set."
       begin
         subject.call
-      rescue CapUtil::DeployHalted => err
+      rescue CapUtil::Halted => err
         assert_match exp_msg, err.message
       end
     end
@@ -34,7 +34,7 @@ module CapUtil
       unset = CapUtil::UnsetVar.new(@var_name, exp_msg)
       begin
         unset.call
-      rescue CapUtil::DeployHalted => err
+      rescue CapUtil::Halted => err
         assert_match exp_msg, err.message
       end
     end

metadata

@@ -1,33 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: cap-util
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: -3810944636
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  - rc
+  - 1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Kelly Redding
+- Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-10-18 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :development
   requirement: *id001
   prerelease: false
@@ -52,17 +56,18 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
-        - 1
-        - 1
-        version: "1.1"
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
   requirement: *id003
   prerelease: false
 description: A set of utilities for writing cap tasks.
 email: 
 - kelly@kellyredding.com
+- collin.redding@me.com
 executables: []
 
 extensions: []
@@ -95,6 +100,7 @@ files:
 - test/git_branch_tests.rb
 - test/helper.rb
 - test/irb.rb
+- test/local_cmd_runner_tests.rb
 - test/rake_task_tests.rb
 - test/server_roles_tests.rb
 - test/server_roles_yaml_tests.rb
@@ -121,12 +127,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -140,6 +148,7 @@ test_files:
 - test/git_branch_tests.rb
 - test/helper.rb
 - test/irb.rb
+- test/local_cmd_runner_tests.rb
 - test/rake_task_tests.rb
 - test/server_roles_tests.rb
 - test/server_roles_yaml_tests.rb