torquebox-capistrano-support 1.1.1 → 2.0.0.beta1

data/lib/torquebox/capistrano/recipes.rb

@@ -17,115 +17,12 @@
 
 require 'capistrano'
 
-Capistrano::Configuration.instance.load do 
-
-  # --
-
-  _cset( :app_ruby_version,    1.8 )
-
-  _cset( :torquebox_home,      '/opt/torquebox'   )
-  _cset( :jboss_home,          lambda{ "#{torquebox_home}/jboss" } )
-  _cset( :jruby_home,          lambda{ "#{torquebox_home}/jruby" } )
-  _cset( :jruby_opts,          lambda{ "--#{app_ruby_version}" } )
-  _cset( :jruby_bin,           lambda{ "#{jruby_home}/bin/jruby #{jruby_opts}" } )
-
-  _cset( :jboss_config,        'default'      )
-
-  _cset( :jboss_control_style, :initid )
-  _cset( :jboss_init_script,   '/etc/init.d/jbossas' )
-
-  _cset( :jboss_bind_address,  '0.0.0.0'      )
-
-  _cset( :bundle_cmd,          lambda{ "#{jruby_bin} -S bundle" } )
-  _cset( :bundle_flags,        '' )
- 
-  
-  namespace :deploy do
-  
-    desc "Perform a deployment"
-
-    task :default do
-      update
-    end
-  
-    desc "Start TorqueBox Server"
-    task :start do
-      puts "Starting TorqueBox AS"
-      case ( jboss_control_style )
-        when :initd
-          run "#{jboss_init_script} start"
-        when :binscripts
-          run "nohup #{jboss_home}/bin/run.sh -b #{jboss_bind_address} -c #{jboss_config} < /dev/null > /dev/null 2>&1 &"
-      end
-    end
-  
-    desc "Stop TorqueBox Server"
-    task :stop do
-      puts "Stopping TorqueBox AS"
-      case ( jboss_control_style )
-        when :initd
-          run "JBOSS_HOME=#{jboss_home} #{jboss_init_script} stop"
-        when :binscripts
-          run "#{jboss_home}/bin/shutdown.sh -S"
-      end
-    end
-  
-    desc "Restart TorqueBox Server"
-    task :restart do
-      case ( jboss_control_style )
-        when :initd
-          puts "Restarting TorqueBox AS"
-          puts "JBOSS_HOME=#{jboss_home} #{jboss_init_script} restart"
-        when :binscripts
-          puts "deploy:restart only supported with initd control style."
-          puts "Please use deploy:stop and deploy:start."
-      end
-    end
-  
-    namespace :torquebox do
-
-      task :info do
-        puts "torquebox_home.....#{torquebox_home}"
-        puts "jboss_home.........#{jboss_home}"
-        puts "jruby_home.........#{jruby_home}"
-        puts "bundle command.....#{bundle_cmd}"
-      end
-
-      task :check do
-        run "test -x #{jboss_init_script}",                        :roles=>[ :app ]
-        run "test -d #{jboss_home}",                               :roles=>[ :app ]
-        run "test -d #{jboss_home}/server/#{jboss_config}",        :roles=>[ :app ]
-        run "test -w #{jboss_home}/server/#{jboss_config}/deploy", :roles=>[ :app ]
-        run "test -w #{torquebox_home}/apps", :roles=>[ :app ]
-        unless ( [ :initd, :binscripts ].include?( jboss_control_style.to_sym ) )
-          fail "invalid jboss_control_style: #{jboss_control_style}"
-        end
-      end
-
-      task :deployment_descriptor do
-        puts "creating deployment descriptor"
-        dd_str = YAML.dump_stream( create_deployment_descriptor() )
-        dd_file = "#{torquebox_home}/apps/#{application}-knob.yml"
-        dd_tmp_file = "#{dd_file}.tmp"
-        cmd =  "cat /dev/null > #{dd_tmp_file}"
-        dd_str.each_line do |line|
-          cmd += " && echo \"#{line}\" >> #{dd_tmp_file}"
-        end
-        cmd += " && mv #{dd_tmp_file} #{dd_file}"
-        run cmd
-      end
-    end
-
-
-    desc "Dump the deployment descriptor"
-    task :dump do
-      puts YAML.dump( create_deployment_descriptor )
-    end
-
-    def create_deployment_descriptor
+module Capistrano
+  class Configuration
+    def create_deployment_descriptor( root )
         dd = {
           'application'=>{
-            'root'=>"#{latest_release}",
+            'root'=>"#{root}",
           },
         }
 
@@ -148,13 +45,132 @@ Capistrano::Configuration.instance.load do
           dd['environment'] = app_environment
         end
 
+        if ( exists?( :rails_env ) )
+          dd['environment'] ||= {}
+          dd['environment']['RAILS_ENV'] = rails_env
+        end
+
         dd
     end
-  
   end
+        
+  module TorqueBox
+
+    def self.load_into( configuration )
+      configuration.load do 
+        # --
+
+        set( :app_ruby_version,    1.8 ) unless exists?( :app_ruby_version )
+        set( :torquebox_home,      '/opt/torquebox' ) unless exists?( :torquebox_home )
+
+        set( :jruby_home,          lambda{ "#{torquebox_home}/jruby" } ) unless exists?( :jruby_home )
+        set( :jruby_opts,          lambda{ "--#{app_ruby_version}" } ) unless exists?( :jruby_opts )
+        set( :jruby_bin,           lambda{ "#{jruby_home}/bin/jruby #{jruby_opts}" } ) unless exists?( :jruby_bin )
+
+        set( :jboss_home,          lambda{ "#{torquebox_home}/jboss" } ) unless exists?( :jboss_home )
+        set( :jboss_control_style, :initid ) unless exists?( :jboss_control_style )
+        set( :jboss_init_script,   '/etc/init.d/jboss-as-standalone' ) unless exists?( :jboss_init_script )
+        set( :jboss_bind_address,  '0.0.0.0' ) unless exists?( :jboss_bind_address )
+
+        set( :bundle_cmd,          lambda{ "#{jruby_bin} -S bundle" } ) unless exists?( :bundle_cmd )
+        set( :bundle_flags,        '' ) unless exists?( :bundle_flags )
+        
+        namespace :deploy do
+        
+          desc "Perform a deployment"
+
+          task :default do
+            update
+          end
+        
+          desc "Start TorqueBox Server"
+          task :start do
+            puts "Starting TorqueBox AS"
+            case ( jboss_control_style )
+              when :initd
+                run "#{jboss_init_script} start"
+              when :binscripts
+                run "nohup #{jboss_home}/bin/standalone.sh -b #{jboss_bind_address} < /dev/null > /dev/null 2>&1 &"
+            end
+          end
+        
+          desc "Stop TorqueBox Server"
+          task :stop do
+            puts "Stopping TorqueBox AS"
+            case ( jboss_control_style )
+              when :initd
+                run "JBOSS_HOME=#{jboss_home} #{jboss_init_script} stop"
+              when :binscripts
+                run "#{jboss_home}/bin/jboss-admin.sh --connect :shutdown"
+            end
+          end
+        
+          desc "Restart TorqueBox Server"
+          task :restart do
+            case ( jboss_control_style )
+              when :initd
+                puts "Restarting TorqueBox AS"
+                puts "JBOSS_HOME=#{jboss_home} #{jboss_init_script} restart"
+              when :binscripts
+                run "JBOSS_HOME=#{jboss_home} #{jboss_init_script} stop"
+                run "nohup #{jboss_home}/bin/standalone.sh -bpublic=#{jboss_bind_address} < /dev/null > /dev/null 2>&1 &"
+            end
+          end
+        
+          namespace :torquebox do
+
+            task :info do
+              puts "torquebox_home.....#{torquebox_home}"
+              puts "jboss_home.........#{jboss_home}"
+              puts "jruby_home.........#{jruby_home}"
+              puts "bundle command.....#{bundle_cmd}"
+            end
+
+            task :check do
+              puts "style #{jboss_control_style}"
+              if ( jboss_control_style == :initd )
+                run "test -x #{jboss_init_script}",                        :roles=>[ :app ]
+              end
+              run "test -d #{jboss_home}",                               :roles=>[ :app ]
+              unless ( [ :initd, :binscripts ].include?( jboss_control_style.to_sym ) )
+                fail "invalid jboss_control_style: #{jboss_control_style}"
+              end
+            end
+
+            task :deployment_descriptor do
+              puts "creating deployment descriptor"
+              dd_str = YAML.dump_stream( create_deployment_descriptor(latest_release) )
+              dd_file = "#{jboss_home}/standalone/deployments/#{application}-knob.yml"
+              cmd =  "cat /dev/null > #{dd_file}"
+              dd_str.each_line do |line|
+                cmd += " && echo \"#{line}\" >> #{dd_file}"
+              end
+              cmd += " && echo '' >> #{dd_file}"
+              run cmd
+              run "touch #{dd_file}.dodeploy"
+            end
+          end
+
+
+          desc "Dump the deployment descriptor"
+          task :dump do
+            dd = create_deployment_descriptor( latest_release )
+            puts dd
+            exit
+            puts YAML.dump( create_deployment_descriptor( latest_release ) )
+          end
+
+        end
+
+        before 'deploy:check',   'deploy:torquebox:check'
+        after  'deploy:symlink', 'deploy:torquebox:deployment_descriptor'
+      end
+    end
+  end
+end
 
-  before 'deploy:check',   'deploy:torquebox:check'
-  after  'deploy:symlink', 'deploy:torquebox:deployment_descriptor'
 
+if Capistrano::Configuration.instance
+  Capistrano::TorqueBox.load_into(Capistrano::Configuration.instance)
 end
 

data/licenses/lgpl-2.1.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

data/spec/recipes_spec.rb

@@ -0,0 +1,50 @@
+# 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
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'spec_helper'
+require 'torquebox-capistrano-support'
+
+describe Capistrano::TorqueBox, "loaded into a configuration" do
+
+  before do
+    @configuration = Capistrano::Configuration.new
+    Capistrano::TorqueBox.load_into(@configuration)
+  end
+
+  it "should define app_ruby_version" do
+    @configuration.exists?( :app_ruby_version ).should be_true
+  end
+
+  it "should default app_ruby_version to 1.8" do
+    @configuration.fetch( :app_ruby_version ).should == 1.8
+  end
+
+  it "should allow default override for app_ruby_version" do
+    @configuration.set( :app_ruby_version, 1.9 )
+    @configuration.fetch( :app_ruby_version ).should == 1.9
+  end
+
+  it "should create a deployment descriptor" do
+    @configuration.should respond_to(:create_deployment_descriptor)
+  end
+
+  it "should set RAILS_ENV based on :rails_env" do
+    @configuration.set( :rails_env, 'development' )
+    @configuration.create_deployment_descriptor('/path/to/app')['environment']['RAILS_ENV'].should == 'development'
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+# 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
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+
+require 'capistrano-spec'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-capistrano-support
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,10 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2011-12-02 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
@@ -28,8 +70,9 @@ files:
   - lib/org.torquebox.capistrano-support.rb
   - lib/torquebox-capistrano-support.rb
   - lib/torquebox/capistrano/recipes.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/torquebox-capistrano-support/
+  - spec/recipes_spec.rb
+  - spec/spec_helper.rb
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-capistrano-support/
 licenses: 
   - lgpl
 post_install_message: 
@@ -46,15 +89,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: TorqueBox Capistrano Support
-test_files: []
-
+test_files: 
+  - spec/recipes_spec.rb