torquebox-capistrano-support 2.1.2 → 2.2.0

data/lib/torquebox/capistrano/recipes.rb

@@ -17,6 +17,7 @@
 
 require 'capistrano'
 
+# @api private
 module Capistrano
   class Configuration
     def create_deployment_descriptor( root )
@@ -51,6 +52,11 @@ module Capistrano
           dd['environment']['RAILS_ENV'] = rails_env
         end
 
+	if (exists?( :stomp_host ) )
+	  dd['stomp'] ||= {}
+	  dd['stomp']['host'] = stomp_host
+	end
+
         dd
     end
   end
@@ -67,7 +73,7 @@ module Capistrano
         if exists?( :app_ruby_version ) && !exists?( :jruby_opts )
           set( :jruby_opts,          lambda{ "--#{app_ruby_version}" } )
         end
-        set( :jruby_bin,           lambda{ "#{jruby_home}/bin/jruby #{jruby_opts}" } ) unless exists?( :jruby_bin )
+        set( :jruby_bin,           lambda{ "#{jruby_home}/bin/jruby #{jruby_opts if exists?( :jruby_opts )}" } ) unless exists?( :jruby_bin )
 
         set( :jboss_home,          lambda{ "#{torquebox_home}/jboss" } ) unless exists?( :jboss_home )
         set( :jboss_control_style, :initd ) unless exists?( :jboss_control_style )

data/spec/recipes_spec.rb

@@ -1,15 +1,15 @@
 # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-# 
+#
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
-# 
+#
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this software; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -25,26 +25,35 @@ describe Capistrano::TorqueBox, "loaded into a configuration" do
     Capistrano::TorqueBox.load_into(@configuration)
   end
 
-  it "should not define app_ruby_version by default" do
-    @configuration.exists?( :app_ruby_version ).should be_false
-  end
+  context "Ruby interpreter version" do
+    it "should not define app_ruby_version by default" do
+      @configuration.exists?( :app_ruby_version ).should be_false
+    end
 
-  it "should allow default 1.9 override for app_ruby_version" do
-    @configuration.set( :app_ruby_version, 1.9 )
-    Capistrano::TorqueBox.load_into(@configuration)
-    @configuration.fetch( :app_ruby_version ).should == 1.9
-  end
+    it "should allow setting neither app_ruby_version nor jruby_opts" do
+      Capistrano::TorqueBox.load_into(@configuration)
+      @configuration.exists?( :app_ruby_version ).should be_false
+      @configuration.exists?( :jruby_opts ).should be_false
+      expect { @configuration.fetch( :jruby_bin ) }.not_to raise_error
+    end
 
-  it "should allow default 1.8 override for app_ruby_version" do
-    @configuration.set( :app_ruby_version, 1.8 )
-    Capistrano::TorqueBox.load_into(@configuration)
-    @configuration.fetch( :app_ruby_version ).should == 1.8
-  end
+    it "should allow default 1.9 override for app_ruby_version" do
+      @configuration.set( :app_ruby_version, 1.9 )
+      Capistrano::TorqueBox.load_into(@configuration)
+      @configuration.fetch( :app_ruby_version ).should == 1.9
+    end
 
-  it "should add app_ruby_version if set to jruby opts if unset" do
-    @configuration.set( :app_ruby_version, 1.9 )
-    Capistrano::TorqueBox.load_into(@configuration)
-    @configuration.fetch( :jruby_opts ).should == "--1.9"
+    it "should allow default 1.8 override for app_ruby_version" do
+      @configuration.set( :app_ruby_version, 1.8 )
+      Capistrano::TorqueBox.load_into(@configuration)
+      @configuration.fetch( :app_ruby_version ).should == 1.8
+    end
+
+    it "should add app_ruby_version if set to jruby opts if unset" do
+      @configuration.set( :app_ruby_version, 1.9 )
+      Capistrano::TorqueBox.load_into(@configuration)
+      @configuration.fetch( :jruby_opts ).should == "--1.9"
+    end
   end
 
   it "should not modify jruby_opts if already set" do
@@ -63,4 +72,23 @@ describe Capistrano::TorqueBox, "loaded into a configuration" do
     @configuration.create_deployment_descriptor('/path/to/app')['environment']['RAILS_ENV'].should == 'development'
   end
 
+  context "Virtual host configuration" do
+    it "should set the web listening host" do
+      @configuration.set(:app_host, 'taquito.com')
+      @configuration.create_deployment_descriptor('/path/to/app')['web']['host'].should eq('taquito.com')
+    end
+
+    it "should not care if there is no app host" do
+      @configuration.set(:app_context, "/")
+      @configuration.create_deployment_descriptor('/path/to/app/')['web'].should_not have_key('host')
+    end
+  end
+
+  context "Stomp configuration" do
+    it "should set the stomp hostname" do
+      @configuration.set(:stomp_host, "awesome.com")
+      @configuration.create_deployment_descriptor('/path/to/app')['stomp']['host'].should eq("awesome.com")
+    end
+  end
+
 end

metadata

@@ -1,103 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: torquebox-capistrano-support
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.1.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 2.2.0
 platform: ruby
-authors: 
-  - The TorqueBox Team
-autorequire: 
+authors:
+- The TorqueBox Team
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-24 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.7.4
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: capistrano
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.9.0
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: capistrano-spec
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.1.0
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.7.0
-    type: :development
-    version_requirements: *id004
-description: ""
-email: 
-  - torquebox-dev@torquebox.org
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: capistrano-spec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  prerelease: false
+  type: :development
+description: ''
+email:
+- torquebox-dev@torquebox.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - licenses/lgpl-2.1.txt
-  - lib/torquebox-capistrano-support.rb
-  - lib/org.torquebox.capistrano-support.rb
-  - lib/torquebox/capistrano/recipes.rb
-  - spec/spec_helper.rb
-  - spec/recipes_spec.rb
+files:
+- licenses/lgpl-2.1.txt
+- lib/org.torquebox.capistrano-support.rb
+- lib/torquebox-capistrano-support.rb
+- lib/torquebox/capistrano/recipes.rb
+- spec/recipes_spec.rb
+- spec/spec_helper.rb
 homepage: http://torquebox.org/
-licenses: 
-  - lgpl
-post_install_message: 
+licenses:
+- lgpl
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: TorqueBox Capistrano Support
-test_files: 
-  - spec/recipes_spec.rb
+test_files:
+- spec/recipes_spec.rb