torquebox-rake-support 2.0.0.beta1 → 2.0.0.beta2

data/lib/org.torquebox.rake-support.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox/deploy_utils.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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
@@ -70,7 +70,7 @@ module TorqueBox
       end
 
       def cluster_config_file
-        File.join(config_dir, 'torquebox', "standalone-preview-ha.xml")
+        "standalone-ha.xml"
       end
 
       def properties_dir
@@ -98,12 +98,12 @@ module TorqueBox
         File.join( modules_dir, 'org', 'torquebox' )
       end
 
-      def archive_name(root=Dir.pwd)
-        File.basename( root ) + '.knob'
+      def archive_name(root = Dir.pwd)
+        normalize_archive_name( File.basename( root || Dir.pwd ) )
       end
 
       def deployment_name(root = Dir.pwd)
-        File.basename( root ) + '-knob.yml'
+        normalize_yaml_name( File.basename( root || Dir.pwd ) )
       end
 
       def check_server
@@ -148,7 +148,11 @@ module TorqueBox
         end
       end
 
-      def create_archive(archive = archive_name, app_dir = Dir.pwd, dest_dir = Dir.pwd)
+      def create_archive(opts = {})
+
+        archive = normalize_archive_name( find_option( opts, 'name' ) || archive_name )
+        app_dir = find_option( opts, 'app_dir') || Dir.pwd
+        dest_dir = find_option( opts, 'dest_dir') || Dir.pwd
         skip_files = %w{ ^log$ ^tmp$ ^test$ ^spec$ \.knob$ vendor }
 
         archive_path = File.join(dest_dir, archive)
@@ -185,7 +189,7 @@ module TorqueBox
       def basic_deployment_descriptor(options = {})
         env = options[:env] || options['env']
         env ||= defined?(RACK_ENV) ? RACK_ENV : ENV['RACK_ENV']
-        env ||= defined?(::Rails) ? ::Rails.env : ENV['RAILS_ENV']
+        env ||= defined?(::Rails) && Rails.respond_to?(:env) ? ::Rails.env : ENV['RAILS_ENV']
 
         root = options[:root] || options['root'] || Dir.pwd
         context_path = options[:context_path] || options['context_path']
@@ -210,7 +214,9 @@ module TorqueBox
         d
       end
 
-      def deploy_yaml(deployment_descriptor, name = deployment_name, dest_dir = deploy_dir)
+      def deploy_yaml(deployment_descriptor, opts = {})
+        name = normalize_yaml_name( find_option( opts, 'name' ) || deployment_name(opts[:root] || opts['root']) )
+        dest_dir = opts[:dest_dir] || opts['dest_dir'] || deploy_dir
         deployment = File.join( dest_dir, name )
         File.open( deployment, 'w' ) do |file|
           YAML.dump( deployment_descriptor, file )
@@ -219,43 +225,30 @@ module TorqueBox
         [name, dest_dir]
       end
 
-      def deploy_archive(archive_path = nil, dest_dir = deploy_dir)
-        archive_path ||= File.join( Dir.pwd, archive_name )
+      def deploy_archive(opts = {})
+        name = normalize_archive_name( find_option( opts, 'name' ) || archive_name )
+        archive_path = find_option( opts, 'archive_path' ) || File.join( Dir.pwd, name )
+        dest_dir = find_option( opts, 'dest_dir' ) || deploy_dir
         FileUtils.cp( archive_path, dest_dir )
         archive = File.basename( archive_path )
         FileUtils.touch( dodeploy_file( archive ) )
         [archive, dest_dir]
       end
 
-      def dodeploy_file( name )
+      def dodeploy_file(name)
         File.join( DeployUtils.deploy_dir, "#{name}" ) + ".dodeploy"
       end
 
-      def deployed_file( name )
+      def deployed_file(name)
         File.join( DeployUtils.deploy_dir, "#{name}" ) + ".deployed"
       end
-
-      def undeploy(name = deployment_name, from_dir = deploy_dir)
-        deployment = File.join( from_dir, name )
-        undeployed = false
-        if File.exists?( dodeploy_file( name ) )
-          FileUtils.rm_rf( dodeploy_file( name ) )
-          undeployed = true
-        end
-        if File.exists?( deployed_file( name ) )
-          FileUtils.rm_rf( deployed_file( name ) )
-          undeployed = true
-        end
-        if File.exists?( deployment )
-          FileUtils.rm_rf( deployment )
-          undeployed = true
-        end
-
-        if undeployed
-          [name, from_dir]
-        else
-          puts "Can't undeploy #{deployment}. It does not appear to be deployed."
-        end
+      
+      def undeploy_archive(opts = {})
+        undeploy( normalize_archive_name( find_option( opts, 'name' ) || archive_name( opts[:root] ) ), opts )
+      end 
+      
+      def undeploy_yaml(opts = {})
+        undeploy( normalize_yaml_name( find_option( opts, 'name' ) || deployment_name( opts[:root] ) ), opts )
       end
 
       # TODO: This is not windows friendly
@@ -313,6 +306,45 @@ module TorqueBox
       def windows?
         Config::CONFIG['host_os'] =~ /mswin/
       end
+      
+      def find_option(opt, key)
+        opt[key.to_sym] || opt[key] || ENV[key] || ENV[key.upcase]
+      end
+      
+      def normalize_yaml_name(name)
+        name[-9..-1] == '-knob.yml' ? name : name + '-knob.yml'
+      end
+      
+      def normalize_archive_name(name)
+        name[-5..-1] == '.knob' ? name : name + '.knob'
+      end
+      
+      private 
+      
+      def undeploy(name, opts = {})
+        puts "Attempting to undeploy #{name}"
+        from_dir = find_option( opts, 'deploy_dir' ) || deploy_dir
+        deployment = File.join( from_dir, name )
+        undeployed = false
+        if File.exists?( dodeploy_file( name ) )
+          FileUtils.rm_rf( dodeploy_file( name ) )
+          undeployed = true
+        end
+        if File.exists?( deployed_file( name ) )
+          FileUtils.rm_rf( deployed_file( name ) )
+          undeployed = true
+        end
+        if File.exists?( deployment )
+          FileUtils.rm_rf( deployment )
+          undeployed = true
+        end
+
+        if undeployed
+          [name, from_dir]
+        else
+          puts "Can't undeploy #{deployment}. It does not appear to be deployed."
+        end
+      end
 
     end
   end

data/lib/torquebox/launchd.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox/rails.rb

@@ -0,0 +1,44 @@
+# Copyright 2008-2012 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.
+
+begin
+  require 'rails/generators'
+  require 'rails/generators/rails/app/app_generator'
+rescue LoadError
+  # Rails isn't installed, bail out
+  return
+end
+
+module TorqueBox
+  class Rails
+    def self.new_app
+      # Assumes ARGV[0] already has the application name
+      ARGV << [ "-m", TorqueBox::Rails.template ]
+      ARGV.flatten!
+      ::Rails::Generators::AppGenerator.start
+    end
+
+    def self.apply_template( root )
+      generator = ::Rails::Generators::AppGenerator.new( [root], {}, :destination_root => root )
+      generator.apply TorqueBox::Rails.template 
+    end
+
+    def self.template
+      "#{ENV['TORQUEBOX_HOME']}/share/rails/template.rb"
+    end
+  end
+end

data/lib/torquebox/rake/tasks/archive.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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
@@ -21,9 +21,8 @@ require 'torquebox/deploy_utils'
 namespace :torquebox do
 
   desc "Create a nice self-contained application archive"
-  task :archive do
-    puts "Creating archive: #{TorqueBox::DeployUtils.archive_name}"
-    path = TorqueBox::DeployUtils.create_archive
+  task :archive, :name do |t, args|
+    path = TorqueBox::DeployUtils.create_archive( args )
     puts "Created archive: #{path}"
   end
 

data/lib/torquebox/rake/tasks/deployment.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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
@@ -21,18 +21,20 @@ require 'torquebox/deploy_utils'
 namespace :torquebox do
 
   desc "Deploy the app in the current directory"
-  task :deploy, [:context_path] => ['torquebox:check'] do |t, args|
+  task :deploy, [:context_path, :name] => ['torquebox:check'] do |t, args|
     descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor( :context_path => args[:context_path] )
-    deployment_name, deploy_dir = TorqueBox::DeployUtils.deploy_yaml( descriptor )    
+    deployment_name, deploy_dir = TorqueBox::DeployUtils.deploy_yaml( descriptor, args )
   
     puts "Deployed: #{deployment_name}"
     puts "    into: #{deploy_dir}"
   end
 
   desc "Undeploy the app in the current directory"
-  task :undeploy=>['torquebox:check'] do
-    deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy # try -knob.yml first
-    deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy( TorqueBox::DeployUtils.archive_name ) unless deploy_name
+  task :undeploy, [:name] => ['torquebox:check'] do |t, args|
+    deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy_yaml( args ) # try -knob.yml first
+    unless deploy_name
+      deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy_archive( args )
+    end
 
     if deploy_name
       puts "Undeployed: #{deploy_name}"
@@ -44,13 +46,27 @@ namespace :torquebox do
 
   desc "Create (if needed) and deploy as application archive"
   namespace :deploy do
-    task :archive=>[ 'torquebox:archive' ] do
-      archive_name, deploy_dir = TorqueBox::DeployUtils.deploy_archive
+    task :archive, [:name] => [ 'torquebox:archive' ] do |t, args|
+      archive_name, deploy_dir = TorqueBox::DeployUtils.deploy_archive( args )
       
       puts "Deployed: #{archive_name}"
       puts "    into: #{deploy_dir}"
     end
   end
+  
+  desc "Undeploy an application archive"
+  namespace :undeploy do
+    task :archive, [:name] => [ 'torquebox:check' ] do |t, args|
+      deploy_name, deploy_dir = TorqueBox::DeployUtils.undeploy_archive( args )
+      
+      if deploy_name
+        puts "Undeployed: #{deploy_name}"
+        puts "      from: #{deploy_dir}" 
+      else
+        puts "Nothing to undeploy"
+      end
+    end
+  end
    
 end
 

data/lib/torquebox/rake/tasks/server.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox/rake/tasks.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox/server.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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
@@ -45,6 +45,15 @@ module TorqueBox
     def self.gem_version
       Gem::Version.new( Gem::VERSION )
     end
+
+    def self.setup_environment
+      ENV['TORQUEBOX_HOME'] ||= torquebox_home
+      ENV['JBOSS_HOME'] ||= "#{ENV['TORQUEBOX_HOME']}/jboss"
+      ENV['JRUBY_HOME'] ||= jruby_home
+      ENV['JBOSS_OPTS'] ||= "-Djruby.home=#{jruby_home}"
+      %w(TORQUEBOX_HOME JBOSS_HOME JRUBY_HOME).each { |key| puts "[ERROR] #{key} is not set. Install torquebox-server gem or manually set #{key}" unless ENV[key] }
+    end
+
   end
 
 end

data/lib/torquebox/upstart.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/lib/torquebox-rake-support.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 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

data/spec/deploy_utils_spec.rb

@@ -70,7 +70,7 @@ describe TorqueBox::DeployUtils do
 
   describe '.jboss_conf' do
     extend PathHelper
-    it 'should defafult to "standalone"' do
+    it 'should default to "standalone"' do
       @util.jboss_conf.should == 'standalone'
     end
 
@@ -148,10 +148,6 @@ describe TorqueBox::DeployUtils do
     it 'should be ENV["JBOSS_HOME"]/standalone/configuration' do
       @util.config_dir.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/configuration".downcase
     end
-
-    it 'should be ENV["JBOSS_HOME"]/standalone/configuration/torquebox/standalone-preview-ha.xml' do
-      @util.cluster_config_file.downcase.should == "#{absolute_prefix}#{ENV['JBOSS_HOME']}/standalone/configuration/torquebox/standalone-preview-ha.xml".downcase
-    end
   end
 
 

data/spec/server_spec.rb

@@ -10,6 +10,15 @@ describe TorqueBox::Server do
   it "should return nil if torquebox-server is not installed" do
     TorqueBox::Server.torquebox_home.should == nil
   end
+
+  describe ".setup_environment" do
+    it "should use TORQUEBOX_HOME to determine JBOSS_HOME" do
+      ENV["JBOSS_HOME"] = nil
+      ENV["TORQUEBOX_HOME"] = "/path/to/torquebox"
+      TorqueBox::Server.setup_environment
+      ENV["JBOSS_HOME"].should == "/path/to/torquebox/jboss"
+    end
+  end
   
   describe "under jruby-1.6.5" do
     it "should use torquebox-server gem's installed path" do

data/spec/spec_helper.rb

@@ -27,14 +27,6 @@ module PathHelper
   def self.extended(cls)
     cls.class_eval do
 
-      def pwd()
-        self.class.pwd
-      end
-
-      def self.pwd()
-        ::Dir.pwd
-      end
-
       def absolute_prefix
         self.class.absolute_prefix
       end
@@ -44,19 +36,6 @@ module PathHelper
         'C:'
       end
   
-      def vfs_path(path)
-        self.class.vfs_path( path )
-      end
-
-      def self.vfs_path(path)
-        return path                   if ( path[0,4] == 'vfs:' )
-        return "vfs:#{path}"          if ( path[0,1] == '/' )
-        return "vfs:#{path}"          if ( path[0,1] == '\\' )
-        return vfs_path( "/#{path}" ) if ( path =~ %r(^[a-zA-Z]:) )
-        return vfs_path( File.join( pwd, path ) )
-      end
-
-
     end
 
   end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-rake-support
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -52,6 +52,7 @@ files:
   - lib/torquebox-rake-support.rb
   - lib/torquebox/deploy_utils.rb
   - lib/torquebox/launchd.rb
+  - lib/torquebox/rails.rb
   - lib/torquebox/server.rb
   - lib/torquebox/upstart.rb
   - lib/torquebox/rake/tasks.rb