tomcat-manager 0.0.3 → 0.0.4

data/README

@@ -1,3 +1,6 @@
-This is a ruby library that allows access to the tomcat manager application. 
+This is a ruby library that allows access to the tomcat manager application.
 
- 
+
+See Also:
+http://tomcat.apache.org/tomcat-6.0-doc/manager-howto.html
+http://www.datadisk.co.uk/html_docs/java_app/tomcat6/tomcat6_admin.htm

data/VERSION

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

data/lib/tomcat_manager/core.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # © 2012 Dakota Bailey
 class TomcatManager
-	@apps = nil
-
 	def initialize(base_url, user, pass, timeout = nil, open_timeout = nil)
 		@base_url = base_url
 		@user = user
@@ -11,6 +9,40 @@ class TomcatManager
     @open_timeout = open_timeout
 	end
 
+  def resources(type = nil)
+    opts = {}
+    if type != nil
+      params = {"type" => type}
+      opts[:headers] = {:params => params}
+    end
+    results = execute("redeploy", opts)
+    if !/^OK.*/.match results
+      puts "Unknown error: \n" + results
+      exit 1
+    end
+    return results
+  end
+
+
+  def serverinfo()
+    results = execute("serverinfo")
+    if !/^OK.*/.match results
+      puts "Unknown error: \n" + results
+      exit 1
+    end
+    return results
+  end
+
+  def redeploy(ctx_path)
+    params = {"path" => ctx_path}
+    results = execute("redeploy", {:headers => {:params => params}})
+    if !/^OK.*/.match results
+      puts "Unknown error: \n" + results
+      exit 1
+    end
+    return results
+  end
+
   def undeploy(ctx_path)
     params = {"path" => ctx_path}
     results = execute("undeploy", {:headers => {:params => params}})
@@ -33,24 +65,22 @@ class TomcatManager
 	end
 
 	def list()
-		if @apps == nil
-			@apps = {}
-			apps_raw = execute("list")
-			lines = apps_raw.split "\n"
-			if !/^OK.*/.match lines[0]
-				die "Unknown error: \n" + apps_raw
-			end
-			lines.slice(1, lines.length).each { |line|
-				foo = /^\/(.*):(.*):(.*):(.*)$/
-				data = foo.match line
-				name = data[4].chomp
-				ctx = data[1]
-				status = data[2]
-				foo = data[3]
-				@apps[name] = {:name => name, :ctx => ctx, :status => status, :foo => foo}
-			}
-		end
-		return @apps
+    apps_raw = execute("list")
+    lines = apps_raw.split "\n"
+    if !/^OK.*/.match lines[0]
+      die "Unknown error: \n" + apps_raw
+    end
+    apps = {}
+    lines.slice(1, lines.length).each { |line|
+      rg = /^\/(.*):(.*):(.*):(.*)$/
+      data = rg.match line
+      name = data[4].chomp
+      ctx = data[1]
+      status = data[2]
+      sess_cnt = data[3]
+      apps[name] = {:name => name, :ctx => ctx, :status => status, :sessions => sess_cnt}
+    }
+    return apps
 	end
 
 	def installed?(name)

data/tomcat-manager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tomcat-manager}
-  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 = ["Dakota Bailey"]
-  s.date = %q{2012-04-05}
+  s.date = %q{2012-04-17}
   s.description = %q{Library for interacting with the tomcat manager web application.}
   s.email = %q{dakota.bailey@gmail.com}
   s.extra_rdoc_files = [
@@ -27,8 +27,7 @@ Gem::Specification.new do |s|
     "lib/tomcat_manager/core.rb",
     "test/helper.rb",
     "test/test_tomcat-manager.rb",
-    "tomcat-manager.gemspec",
-    "tomcat_manager.gemspec"
+    "tomcat-manager.gemspec"
   ]
   s.homepage = %q{http://github.com/dbailey/tomcat-manager}
   s.licenses = ["MIT"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dakota Bailey
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 -06:00
+date: 2012-04-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,7 +117,6 @@ files:
 - test/helper.rb
 - test/test_tomcat-manager.rb
 - tomcat-manager.gemspec
-- tomcat_manager.gemspec
 has_rdoc: true
 homepage: http://github.com/dbailey/tomcat-manager
 licenses: 

data/tomcat_manager.gemspec

@@ -1,11 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = 'tomcat_manager'
-  s.version     = '0.0.1.pre'
-  s.date        = '2012-04-03'
-  s.summary     = "Ruby Gem to interact with the tomcat manager application."
-  s.description = "Ruby Gem to interact with the tomcat manager application."
-  s.authors     = ["Dakota Bailey"]
-  s.email       = 'dakota.bailey@gmail.com'
-  s.files       = ["lib/tomcat_manager.rb"]
-  s.homepage    = 'https://github.com/dbailey/tomcat_manager.rb'
-end