rtomcat 0.0.3 → 0.0.4

data/Rakefile

@@ -9,38 +9,30 @@ begin
     gem.email = "darrinholst@gmail.com"
     gem.homepage = "http://github.com/darrinholst/rtomcat"
     gem.authors = ["Darrin Holst"]
-    gem.rubyforge_project = "rtomcat"
-    gem.add_dependency("rest-client", ">= 1.0.3")    
+    gem.add_dependency("rest-client", ">= 1.0.3")
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
-  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/manager.rb

@@ -1,38 +1,41 @@
 require 'rest_client'
 
 class Tomcat::Manager
-  def initialize(url, username, password)
+  def initialize(url, username, password, timeout = nil)
     @url = url
     @username = username
     @password = password
+    @timeout = timeout
   end
-  
+
   def undeploy(appname)
     check_response(resource('undeploy', appname).get)
   end
-  
+
   def deploy(appname, file)
     check_response(resource('deploy', appname).put(file))
   end
-  
+
   def redeploy(appname, file)
     begin
       undeploy(appname)
     rescue
     end
-    
+
     deploy(appname, file)
   end
-  
+
   private
-  
+
   def check_response(response)
-    match = response.match(/(.*) - .*/)    
+    match = response.match(/(.*) - .*/)
     raise("http status code: #{response.code}, message: #{response}") unless match && match[1].eql?("OK")
     response
   end
 
   def resource(function, appname)
-    RestClient::Resource.new("#{@url}/#{function}?path=/#{appname}", :user => @username, :password => @password)
+    options = {:user => @username, :password => @password}
+    options[:timeout] = @timeout if @timeout
+    RestClient::Resource.new("#{@url}/#{function}?path=/#{appname}", options)
   end
 end

data/rtomcat.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rtomcat}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darrin Holst"]
-  s.date = %q{2009-07-16}
+  s.date = %q{2010-01-28}
   s.email = %q{darrinholst@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,18 +25,18 @@ Gem::Specification.new do |s|
      "lib/manager.rb",
      "lib/rtomcat.rb",
      "rtomcat.gemspec",
-     "test/manager_test.rb",
-     "test/test_helper.rb"
+     "spec/manager_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/darrinholst/rtomcat}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rtomcat}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{ruby wrapper around the tomcat manager}
   s.test_files = [
-    "test/manager_test.rb",
-     "test/test_helper.rb"
+    "spec/manager_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -49,3 +52,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rest-client>, [">= 1.0.3"])
   end
 end
+

data/spec/manager_spec.rb

@@ -0,0 +1,73 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+module Tomcat
+  APP = "appname"
+  OK = "OK - some message"
+  UNAUTHROIZED = "401 - Unauthorized"
+  NOT_FOUND = "404 - Not Found"
+
+  describe Manager do
+    before(:each) do
+      @file = mock
+      @resource = mock
+      @manager = Tomcat::Manager.new("http://localhost:8080", "user", "password")
+    end
+
+    it "should undeploy" do
+      expect_new_resource("undeploy").and_return(@resource)
+      @resource.should_receive(:get).and_return(OK)
+      @manager.undeploy(APP)
+    end
+
+    it "should raise if undeploy doesn't work" do
+      UNAUTHROIZED.should_receive(:code).and_return(401)
+      expect_new_resource("undeploy").and_return(@resource)
+      @resource.should_receive(:get).and_return(UNAUTHROIZED)
+      lambda{@manager.undeploy(APP)}.should raise_error("http status code: 401, message: 401 - Unauthorized")
+    end
+
+    it "should deploy" do
+      expect_new_resource("deploy").and_return(@resource)
+      @resource.should_receive(:put).with(@file).and_return(OK)
+      @manager.deploy(APP, @file)
+    end
+
+    it "should raise if deploy doesn't work" do
+      UNAUTHROIZED.should_receive(:code).and_return(401)
+      expect_new_resource("deploy").and_return(@resource)
+      @resource.should_receive(:put).with(@file).and_return(UNAUTHROIZED)
+      lambda{@manager.deploy(APP, @file)}.should raise_error("http status code: 401, message: 401 - Unauthorized")
+    end
+
+    it "should redeploy" do
+      undeploy_resource = mock
+      deploy_resource = mock
+      expect_new_resource("undeploy").and_return(undeploy_resource)
+      undeploy_resource.should_receive(:get).and_return(OK)
+      expect_new_resource("deploy").and_return(deploy_resource)
+      deploy_resource.should_receive(:put).with(@file).and_return(OK)
+      @manager.redeploy(APP, @file)
+    end
+    
+    it "should ignore undeploy errors if redeploying" do
+      undeploy_resource = mock
+      deploy_resource = mock
+      expect_new_resource("undeploy").and_return(undeploy_resource)
+      undeploy_resource.should_receive(:get).and_return(NOT_FOUND)
+      expect_new_resource("deploy").and_return(deploy_resource)
+      deploy_resource.should_receive(:put).with(@file).and_return(OK)
+      @manager.redeploy(APP, @file)
+    end
+    
+    it "should allow timeout to be specified" do
+      @manager = Tomcat::Manager.new("http://localhost:8080", "user", "password", 120)
+      expect_new_resource("undeploy", :timeout => 120).and_return(@resource)
+      @resource.should_receive(:get).and_return(OK)
+      @manager.undeploy(APP)
+    end
+
+    def expect_new_resource(resource, extra_parmas = {})
+      RestClient::Resource.should_receive(:new).with("http://localhost:8080/#{resource}?path=/#{APP}", {:user => "user", :password => "password"}.merge(extra_parmas))
+    end
+  end
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,12 +1,9 @@
-require 'rubygems'
-require 'test/unit'
-require 'fakeweb'
-
-FakeWeb.allow_net_connect = false
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rtomcat'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
 
-class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtomcat
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Darrin Holst
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -05:00
+date: 2010-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,9 @@ files:
 - lib/manager.rb
 - lib/rtomcat.rb
 - rtomcat.gemspec
-- test/manager_test.rb
-- test/test_helper.rb
+- spec/manager_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/darrinholst/rtomcat
 licenses: []
@@ -66,11 +67,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rtomcat
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ruby wrapper around the tomcat manager
 test_files: 
-- test/manager_test.rb
-- test/test_helper.rb
+- spec/manager_spec.rb
+- spec/spec_helper.rb

data/test/manager_test.rb

@@ -1,80 +0,0 @@
-require 'test_helper'
-
-class ManagerTest < Test::Unit::TestCase
-  def setup
-    @manager = Tomcat::Manager.new("http://localhost:8080", "user", "password")
-  end
-  
-  def test_undeploy
-    FakeWeb.register_uri(:get, undeploy_url, :body => "OK - Undeployed application at context path /appname")
-    assert_nothing_raised { undeploy }
-  end
-  
-  def test_undeploy_when_not_a_200_status
-    FakeWeb.register_uri(:get, undeploy_url, :status => ["401", "Unauthorized"])
-    assert_raises_with("Unauthorized") { undeploy }
-  end
-  
-  def test_undeploy_when_non_ok_response
-    FakeWeb.register_uri(:get, undeploy_url, :body => "FAIL - some error")
-    assert_raises_with("http status code: 200, message: FAIL - some error") { undeploy }
-  end
-  
-  def test_deploy
-    FakeWeb.register_uri(:put, deploy_url, :body => "OK - Deployed application at context path /appname")
-    assert_nothing_raised { deploy }
-  end
-  
-  def test_deploy_when_not_a_200_status
-    FakeWeb.register_uri(:put, deploy_url, :status => ["401", "Unauthorized"])
-    assert_raises_with("Unauthorized") { deploy }
-  end
-  
-  def test_deploy_when_non_ok_response
-    FakeWeb.register_uri(:put, deploy_url, :body => "FAIL - some error")
-    assert_raises_with("http status code: 200, message: FAIL - some error") { deploy }
-  end
-  
-  def test_redeploy
-    FakeWeb.register_uri(:get, undeploy_url, :body => "OK - Undeployed application at context path /appname")
-    FakeWeb.register_uri(:put, deploy_url, :body => "OK - Deployed application at context path /appname")
-    assert_nothing_raised { redeploy }
-  end
-  
-  def test_redeploy_ignores_undeploy_errors
-    FakeWeb.register_uri(:get, undeploy_url, :body => "FAIL - some error")
-    FakeWeb.register_uri(:put, deploy_url, :body => "OK - Deployed application at context path /appname")
-    assert_nothing_raised { redeploy }
-  end
-  
-  private 
-
-  def undeploy_url
-    "http://user:password@localhost:8080/undeploy?path=/appname"
-  end
-  
-  def undeploy
-    @manager.undeploy('appname')
-  end
-  
-  def deploy_url
-    "http://user:password@localhost:8080/deploy?path=/appname"
-  end
-  
-  def deploy
-    @manager.deploy('appname', "FakeWeb doesn't allow for put body interrogation right now, so this parameter doesn't matter")    
-  end
-  
-  def redeploy
-    @manager.redeploy('appname', "Some bogus file content")
-  end
-  
-  def assert_raises_with(message)
-    begin
-      yield
-      fail("should have raised")
-    rescue Exception => e
-      assert_equal(message, e.message)
-    end
-  end
-end