torquespec 0.1.0 → 0.1.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.torquespec/*

data/apps/simple/config.ru

@@ -0,0 +1 @@
+run lambda { |env| [200, {'Content-Type'=>'text/plain'}, "Hello World!\n" ] }

data/lib/torquespec/deployment_descriptor.rb

@@ -10,7 +10,7 @@ module TorqueSpec
       @path = Pathname.new( name.gsub(/\W/,'_') + "-knob.yml" ).expand_path( TorqueSpec.knob_root )
     end
     def path
-      hash || filename || heredoc
+      archive( hash || filename || heredoc )
     end
     def hash
       if @descriptor.is_a? Hash
@@ -32,6 +32,15 @@ module TorqueSpec
       end
       @path.to_s
     end
+    def archive(path)
+      if TorqueSpec.as7? && path.end_with?('.yml')
+        jar = path.sub(/yml$/,'jar')
+        `jar cf #{jar} -C #{File.dirname(path)} #{File.basename(path)}`
+        jar
+      else
+        path
+      end
+    end
     def stringify_keys(x)
       x.is_a?(Hash) ? x.inject({}) {|h,(k,v)| h[k.to_s] = stringify_keys(v); h} : x
     end

data/lib/torquespec/server.rb

@@ -6,11 +6,7 @@ module TorqueSpec
   class Server
 
     def initialize
-      if File.exist?( File.join( TorqueSpec.jboss_home, "bin/run.sh" ) )
-        self.extend AS6
-      else
-        self.extend AS7
-      end
+      self.extend( TorqueSpec.as7? ? AS7 : AS6 )
     end
 
     def start(opts={})

data/lib/torquespec/torquespec.rb

@@ -14,13 +14,16 @@ module TorqueSpec
   end
 
   class << self
-    attr_accessor :host, :port, :knob_root, :jboss_home, :jboss_conf, :jvm_args, :max_heap, :lazy
+    attr_accessor :knob_root, :jboss_home, :jvm_args, :max_heap, :lazy
     def configure
       yield self
     end
     def jvm_args
       max_heap ? @jvm_args.sub(/-Xmx\w+/, "-Xmx#{max_heap}") : @jvm_args
     end
+    def as7?
+      File.exist?( File.join( jboss_home, "bin/standalone.sh" ) )
+    end
   end
 
 end
@@ -28,9 +31,7 @@ end
 # Default TorqueSpec options
 TorqueSpec.configure do |config|
   config.knob_root = ".torquespec"
-  config.lazy = false
   config.jboss_home = ENV['JBOSS_HOME']
-  config.jboss_conf = 'default'
   config.jvm_args = "-Xms64m -Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Djruby_home.env.ignore=true -Dgem.path=default"
 end
 

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/hello_world_spec.rb

@@ -3,7 +3,7 @@ require 'open-uri'
 
 TorqueSpec.lazy = false
 
-describe "simple deployment" do
+describe "simple knob deployment" do
   
   deploy File.join( File.dirname(__FILE__), "../apps/simple.knob" )
 
@@ -12,3 +12,16 @@ describe "simple deployment" do
     response.strip.should == "Hello World!"
   end
 end
+
+describe "simple directory deployment" do
+  
+  deploy <<-END.gsub(/^ {4}/,'')
+    application:
+      root: #{File.dirname(__FILE__)}/../apps/simple
+  END
+
+  it "should greet the world" do
+    response = open("http://localhost:8080") {|f| f.read}
+    response.strip.should == "Hello World!"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -04:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - README.md
 - Rakefile
 - apps/simple.knob
+- apps/simple/config.ru
 - lib/torquespec.rb
 - lib/torquespec/as6.rb
 - lib/torquespec/as7.rb