openshifter 0.4 → 0.5

data/lib/openshifter/version.rb

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

data/templates/openshift/action_hooks/build

@@ -64,41 +64,57 @@ send("setup_#{CONFIG['install']}".to_sym)
 
 ENV['GEM_PATH'] = ENV['GEM_HOME'] = SYS[:gems]
 
-puts '-> Cleaning target'
-FileUtils.rm_rf(SYS[:root])
+def create_jee_structure
+  puts '-> Cleaning target'
+  FileUtils.rm_rf(SYS[:root])
 
-puts '-> Creating target'
-FileUtils.mkdir_p(SYS[:target])
+  puts '-> Creating target'
+  FileUtils.mkdir_p(SYS[:target])
 
-puts '-> Public files'
-FileUtils.cp_r(Dir.glob('public/*'), SYS[:target])
+  puts '-> Public files'
+  FileUtils.cp_r(Dir.glob('public/*'), SYS[:target])
 
-puts '-> META-INF'
-FileUtils.mkdir_p(SYS[:target_meta])
+  puts '-> META-INF'
+  FileUtils.mkdir_p(SYS[:target_meta])
 
-puts '--> Manifest'
-FileUtils.cp(File.expand_path('../templates/MANIFEST.MF', __FILE__), File.join(SYS[:target_meta], 'MANIFEST.MF'))
+  puts '--> Manifest'
+  FileUtils.cp(File.expand_path('../templates/MANIFEST.MF', __FILE__), File.join(SYS[:target_meta], 'MANIFEST.MF'))
 
-puts '--> init.rb'
-initrb = ERB.new(File.read(File.expand_path('../templates/init.rb', __FILE__))).result(binding)
-File.open(File.join(SYS[:target_meta], 'init.rb'), 'w') { |file| file.print(initrb) }
+  puts '--> init.rb'
+  initrb = ERB.new(File.read(File.expand_path('../templates/init.rb', __FILE__))).result(binding)
+  File.open(File.join(SYS[:target_meta], 'init.rb'), 'w') { |file| file.print(initrb) }
 
-puts '-> WEB-INF'
-FileUtils.mkdir_p(SYS[:target_web])
+  puts '-> WEB-INF'
+  FileUtils.mkdir_p(SYS[:target_web])
 
-puts '--> Application data'
-app = Dir.glob('*')
-app.delete('.openshift')
-app.delete('public')
-app.delete('deployments')
-FileUtils.cp_r(app, SYS[:target_web])
+  puts '--> Application data'
+  app = Dir.glob('*')
+  app.delete('.openshift')
+  app.delete('public')
+  app.delete('deployments')
+  FileUtils.cp_r(app, SYS[:target_web])
 
-puts '--> Lib'
-FileUtils.mkdir_p(File.join(SYS[:target_web], 'lib'))
+  puts '--> Lib'
+  FileUtils.mkdir_p(File.join(SYS[:target_web], 'lib'))
+
+  # Common tasks for setting Java thingies
+
+  puts '--> jboss-web.xml'
+  FileUtils.cp(File.expand_path('../templates/jboss-web.xml', __FILE__), File.join(SYS[:target_web], 'jboss-web.xml'))
+
+  puts '--> web.xml'
+  FileUtils.cp(File.expand_path('../templates/web.xml', __FILE__), File.join(SYS[:target_web], 'web.xml'))
+
+  puts '-> Deployment marker'
+  FileUtils.touch("#{SYS[:target]}.dodeploy")
+end
 
 # Installation method specific tasks
 
 def create_remote
+
+  create_jee_structure
+  
   puts '--> Copy runtime'
   FileUtils.mkdir_p(SYS[:libs])
   FileUtils.mkdir_p(SYS[:gems])
@@ -141,11 +157,21 @@ def create_remote
 end
 
 def create_vendor
+
+  create_jee_structure
+  
   puts '--> Copy runtime'
   FileUtils.cp(Dir.glob('.openshift/lib/*.jar'), File.join(SYS[:target_web], 'lib'))
 end
 
 def create_torquebox
+
+  puts '-> Cleaning target'
+  FileUtils.rm_rf(SYS[:root])
+
+  puts '-> Creating target'
+  FileUtils.mkdir_p(SYS[:root])
+
   puts '--> Install JRuby'
   unless File.exists?(SYS[:torquebox_jruby])
     Dir.glob(File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'torquebox', "jruby-*")) { |file| FileUtils.rm_rf(file) }
@@ -157,12 +183,6 @@ def create_torquebox
     FileUtils.rm(SYS[:gemfile_hash]) if File.exists?(SYS[:gemfile_hash])
   end
 
-  unless File.exists?(SYS[:jrack])
-    Dir.glob(File.join(SYS[:libs], "jruby-rack-*")) { |file| FileUtils.rm(file) }
-    puts "---> Downloading jRuby-Rack #{CONFIG['jrack']}"
-    puts `curl -o #{SYS[:jrack]} "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
-  end
-
   puts '--> Gems'
   
   gemfile = Digest::SHA256.file('Gemfile').hexdigest
@@ -212,22 +232,12 @@ def create_torquebox
   FileUtils.ln_s(File.join(SYS[:torquebox], 'torquebox'), ".openshift/config/modules/org/torquebox")
   FileUtils.cp(File.expand_path('../templates/standalone.xml', __FILE__), '.openshift/config/standalone.xml')
 
-  puts '--> Copying libraries'
-  FileUtils.cp(Dir.glob(File.join(SYS[:libs], '*.jar')), File.join(SYS[:target_web], 'lib'))
+  knob = ERB.new(File.read(File.expand_path('../templates/app-knob.yml', __FILE__))).result(binding)
+  File.open(File.join(SYS[:root], 'app-knob.yml'), 'w') { |file| file.print(knob) }
 
+  FileUtils.touch(File.join(SYS[:root], 'app-knob.yml.dodeploy'))
 end
 
 # Run the tasks
 
-send("create_#{CONFIG['install']}".to_sym)
-
-# Common tasks for setting Java thingies
-
-puts '--> jboss-web.xml'
-FileUtils.cp(File.expand_path('../templates/jboss-web.xml', __FILE__), File.join(SYS[:target_web], 'jboss-web.xml'))
-
-puts '--> web.xml'
-FileUtils.cp(File.expand_path('../templates/web.xml', __FILE__), File.join(SYS[:target_web], 'web.xml'))
-
-puts '-> Deployment marker'
-FileUtils.touch("#{SYS[:target]}.dodeploy")
+send("create_#{CONFIG['install']}".to_sym)

data/templates/openshift/action_hooks/templates/app-knob.yml

@@ -0,0 +1,5 @@
+---
+application:
+  root: <%= ENV['OPENSHIFT_REPO_DIR'] %>
+environment:
+  RACK_ENV: production

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openshifter
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -36,6 +36,7 @@ files:
 - templates/openshift/action_hooks/deploy
 - templates/openshift/action_hooks/post_deploy
 - templates/openshift/action_hooks/pre_build
+- templates/openshift/action_hooks/templates/app-knob.yml
 - templates/openshift/action_hooks/templates/init.rb
 - templates/openshift/action_hooks/templates/jboss-web.xml
 - templates/openshift/action_hooks/templates/MANIFEST.MF