screwcap 0.1 → 0.2

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Manifest.txt

@@ -1,3 +1,4 @@
+.bundle/config
 Gemfile
 Gemfile.lock
 History.txt
@@ -33,5 +34,5 @@ test/config/undefined_command_set.rb
 test/config/undefined_item.rb
 test/config/undefined_server.rb
 test/config/unknown_use.rb
+test/config/upload.rb
 test/config/use.rb
-test/test_command_set.rb

data/Rakefile

@@ -11,10 +11,10 @@ Hoe.plugin :newgem
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'screwcap' do
-  self.version  = '0.1'
+  self.version  = '0.2'
   self.developer 'Grant Ammons', 'grant@pipelinedeals.com'
   self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [['net-ssh','>= 2.0.23'],['net-ssh-gateway','>=1.0.1']]
+  self.extra_deps         = [['net-ssh','>= 2.0.23'],['net-ssh-gateway','>=1.0.1'], ['net-scp','>=1.0.4']]
 end
 
 require 'newgem/tasks'

data/lib/screwcap.rb

@@ -16,7 +16,7 @@ require 'screwcap/sequence'
 require 'screwcap/deployer'
 
 module Screwcap
-  VERSION='0.1'
+  VERSION='0.2'
 
   class TaskNotFound < RuntimeError; end
   class NoServersDefined < Exception; end

data/lib/screwcap/task.rb

@@ -129,7 +129,6 @@ class Task < Screwcap::Base
     rescue Net::SSH::AuthenticationFailed => e
       raise Net::SSH::AuthenticationFailed, "Authentication failed for server named #{server.name}.  Please check your authentication credentials."
     rescue Exception => e
-      debugger
       errorlog red("    F: (#{address}): #{e}")
     ensure
       log blue("*** END executing task #{self.__name} on #{server.name} with address #{address}\n\n") unless self.__options[:silent] == true

data/screwcap.gemspec

@@ -6,7 +6,7 @@ require 'bundler/version'
  
 Gem::Specification.new do |s|
   s.name        = "screwcap"
-  s.version     = "0.1"
+  s.version     = "0.2"
   s.platform    = Gem::Platform::RUBY
   s.author     = "Grant Ammons"
   s.email       = ["grant@pipelinedealsco.com"]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
  
   s.add_dependency(['net-ssh','>=2.0.23'])
   s.add_dependency(['net-ssh-gateway','>=1.0.1'])
+  s.add_dependency(['net-scp','>=1.0.4'])
   s.rubyforge_project = 'screwcap'
  
   s.files        = Dir.glob("{bin,lib}/**/*") + %w(README.rdoc screwcap.gemspec)

data/spec/task_spec.rb

@@ -16,22 +16,22 @@ describe "Tasks" do
     Net::SCP.stubs(:upload!).returns(nil)
   end
 
-  #it "should be able to create variables" do
-  #  task = @deployer.__tasks.find {|t| t.name == :task1 }
-  #  task.bango.should == "bongo"
-  #end
+  it "should be able to create variables" do
+    task = @deployer.__tasks.find {|t| t.name == :task1 }
+    task.bango.should == "bongo"
+  end
 
-  #it "should compile run statements" do
-  #  task = @deployer.__tasks.find {|t| t.name == :task1 }
-  #  task.should have(6).__commands
-  #end
+  it "should compile run statements" do
+    task = @deployer.__tasks.find {|t| t.name == :task1 }
+    task.should have(6).__commands
+  end
 
-  #it "should be able to execute statements on a remote server" do
-  #  task = @deployer.__tasks.find {|t| t.name == :task1 }
-  #  task.execute!
-  #  @stderr.should == []
-  #  @stdout.size.should == 29
-  #end
+  it "should be able to execute statements on a remote server" do
+    task = @deployer.__tasks.find {|t| t.name == :task1 }
+    task.execute!
+    @stderr.should == []
+    @stdout.size.should == 29
+  end
 
   it "should be able to use variables in the run statement" do
     task = @deployer.__tasks.find {|t| t.name == :task1 }
@@ -39,30 +39,30 @@ describe "Tasks" do
     command.should == "deploy dir = tester"
   end
 
-  #it "should be able to override a globally set variable" do
-  #  @deployer.deploy_var_2.should == "bongo"
-  #  @deployer.deploy_var_3.should == %w(one two)
+  it "should be able to override a globally set variable" do
+    @deployer.deploy_var_2.should == "bongo"
+    @deployer.deploy_var_3.should == %w(one two)
 
-  #  task = @deployer.__tasks.find {|t| t.name == :task1 }
-  #  task.deploy_var_2.should == "shasta"
+    task = @deployer.__tasks.find {|t| t.name == :task1 }
+    task.deploy_var_2.should == "shasta"
 
-  #  task = @deployer.__tasks.find {|t| t.name == :task2 }
-  #  task.deploy_var_2.should == "purple"
-  #  task.deploy_var_3.should == "mountain dew"
-  #end
+    task = @deployer.__tasks.find {|t| t.name == :task2 }
+    task.deploy_var_2.should == "purple"
+    task.deploy_var_3.should == "mountain dew"
+  end
 
-  #it "should complain if you do not pass the task a server argument" do
-  #  lambda { Deployer.new(:recipe_file => "./test/config/no_server.rb", :silent => false)}.should raise_error(Screwcap::ConfigurationError)
-  #end
+  it "should complain if you do not pass the task a server argument" do
+    lambda { Deployer.new(:recipe_file => "./test/config/no_server.rb", :silent => false)}.should raise_error(Screwcap::ConfigurationError)
+  end
 
-  #it "should complain if you pass a server that is not defined" do
-  #  lambda { Deployer.new(:recipe_file => "./test/config/undefined_server.rb", :silent => false)}.should raise_error(Screwcap::ConfigurationError)
-  #end
+  it "should complain if you pass a server that is not defined" do
+    lambda { Deployer.new(:recipe_file => "./test/config/undefined_server.rb", :silent => false)}.should raise_error(Screwcap::ConfigurationError)
+  end
 
-  #it "should be able to disable parallel running" do
-  #  # this is hard to test.  with threads and stuff
-  #  lambda { @deployer.run! :non_parallel }.should_not raise_error
-  #end
+  it "should be able to disable parallel running" do
+    # this is hard to test.  with threads and stuff
+    lambda { @deployer.run! :non_parallel }.should_not raise_error
+  end
 
   it "should be able to run local commands" do 
     lambda { @deployer.run! :task3 }.should_not raise_error

data/test/config/expect.rb

@@ -16,8 +16,15 @@ task_for :logic, :server => :test do
   end
 end
 
-task_for :expect, :server => :test do 
+command_set :fail do
+  run "ls"
+end
+
+command_set :success do
   run "ls"
-  expect "somecommand", "true", :fail => :revert
+end
+
+task_for :expect, :server => :test do 
+  run "ls", :onfail => :fail, :onsuccess => :success
 end
 

data/test/config/upload.rb

@@ -0,0 +1,4 @@
+server :test, :address => "slashdot.org", :user => "root"
+task_for :upload, :server => :test do
+  scp :local => "/tmp/grant", :remote => "tmp/grant"
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: screwcap
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Grant Ammons
@@ -50,9 +50,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: net-scp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
+        version: 1.0.4
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +80,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,7 +96,7 @@ dependencies:
         - 2
         version: 2.6.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |-
   Screwcap is a library that wraps Net::SSH and makes it easy to perform actions on remote servers.  It's not smart and does not make any assumptions about your setup.  
   
@@ -95,6 +111,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 files: 
+- .bundle/config
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -130,8 +147,8 @@ files:
 - test/config/undefined_item.rb
 - test/config/undefined_server.rb
 - test/config/unknown_use.rb
+- test/config/upload.rb
 - test/config/use.rb
-- test/test_command_set.rb
 has_rdoc: true
 homepage: http://github.com/#{github_username}/#{project_name}
 licenses: []
@@ -167,5 +184,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Screwcap is a library that wraps Net::SSH and makes it easy to perform actions on remote servers
-test_files: 
-- test/test_command_set.rb
+test_files: []
+

data/test/test_command_set.rb

@@ -1,40 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestCommandSet < Test::Unit::TestCase
-
-  def setup
-    Net::SSH.stubs(:start).yields(SSHObject.new(:return_stream => :stdout, :return_data => "hostname = asdf\n"))
-  end
-
-  def test_command_sets
-    deployer = Deployer.new(:recipe_file => "./test/config/command_sets.rb", :silent => true)
-    assert deployer
-
-    task = deployer.__tasks.find {|t| t.name == :use_command_set_no_override }
-    assert task
-
-    task.__command_sets.first.instance_eval(&task.__command_sets.first.__block)
-    assert_equal ["tester","run with tester", "bongo"], task.__commands
-
-    task = deployer.__tasks.find {|t| t.name == :use_command_set_with_override }
-    assert task
-
-    assert_equal ["shasta","run with shasta", "bongo"], task.__commands
-
-    task = deployer.__tasks.find {|t| t.name == :use_command_set_complex_override }
-    assert task
-    assert_equal ["dingle"], task.__commands
-  end
-
-  def test_nested_command_sets
-    deployer = Deployer.new(:recipe_file => "./test/config/command_sets.rb", :silent => true)
-
-    task = deployer.__tasks.find {|t| t.name == :nested_command_set }
-    assert task
-    assert_equal %w(1 2 3 4), task.__commands
-  end
-
-  def test_undefined_value_in_command_set
-    assert_raise(NoMethodError) { Deployer.new(:recipe_file => "./test/config/undefined_command_set.rb", :silent => true) }
-  end
-end