openshifter 0.3 → 0.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3
+
+* clean build hook
+* preliminary support for Torquebox
+
 ## 0.2
 
 * remote installs

data/lib/openshifter/version.rb

@@ -1,3 +1,3 @@
 module OpenShifter
-	VERSION = '0.3' unless const_defined?(:VERSION)
+	VERSION = '0.4' unless const_defined?(:VERSION)
 end

data/templates/openshift/action_hooks/build

@@ -50,7 +50,7 @@ end
 def setup_torquebox
   SYS[:torquebox] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "modules-#{CONFIG['torquebox']}")
   SYS[:torquebox_jruby] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "jruby-#{CONFIG['jruby']}")
-  SYS[:gems] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "gems")
+  SYS[:gems] = File.join(SYS[:torquebox_jruby], 'lib', 'ruby', 'gems', '1.8')
   SYS[:gemfile_hash] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', 'Gemfile.hash')
   SYS[:libs] = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'libs')
   SYS[:jrack] = File.join(SYS[:libs], "jruby-rack-#{CONFIG['jrack']}.jar")
@@ -154,10 +154,7 @@ def create_torquebox
     start_cmd("tar -xzf jruby.tar.gz -C #{File.expand_path('..', SYS[:torquebox_jruby])}")
     start_cmd("rm jruby.tar.gz")
     start_cmd("rm -rf #{SYS[:torquebox_jruby]}/share/ri/1.8/system/*")
-    FileUtils.rm(SYS[:gemfile_hash])
-
-    puts '---> Installing Bundler'
-    start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S gem install bundler --no-ri --no-rdoc")
+    FileUtils.rm(SYS[:gemfile_hash]) if File.exists?(SYS[:gemfile_hash])
   end
 
   unless File.exists?(SYS[:jrack])
@@ -175,6 +172,9 @@ def create_torquebox
   unless gemfile == oldhash
     puts '---> Cleaning gems'
     FileUtils.rm_rf(SYS[:gems])
+
+    puts '---> Installing Bundler'
+    start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S gem install bundler --no-ri --no-rdoc")
     
     puts "---> Bundling gems"
     start_cmd("#{SYS[:torquebox_jruby]}/bin/jruby -S bundle install")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openshifter
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors: