openshifter 0.1 → 0.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2
+
+* remote installs
+* configuration options
+
 ## 0.1
 
 * first version

data/README.md

@@ -1,6 +1,6 @@
 ## OpenShifter
 
-Simple CLI tool to siplify the deployment of Sinatra applications using JRuby to OpenShift
+Simple CLI tool to siplify the deployment of Rack-based applications using JRuby to OpenShift
 
 ## How to
 
@@ -20,7 +20,25 @@ Now you setup your environment
 
 	openshifter-setup
 
-The tools downloads JRuby and JRuby-Rack to create runtime environment. Then Bundler is instaled locally for the application. The whole environment is vendored for you application.
+This step replaces .openshift folder contaning meta-data for your application.
+
+### Step 4
+
+Now you may modify configuration of your deployment. It is stored in .openshift/openshifter. It is ordinary YAML file. Possible options are
+
+    jruby: 1.6.6 # JRuby version you want to use
+    jrack: 1.1.3 # JRuby-Rack version used
+    install: vendor # Instalation method vendor/remote
+
+Vendor instalation method installs all libraries and gems in .openshift folder and are versioned with your application. Remote installation installed all libraries and gems on server in the time of deployment.
+
+If you decide to use remote installation method. You are done. For vendor installation method, please continue.
+
+### Step 5
+
+Downloads JRuby and JRuby-Rack to create runtime environment. Then Bundler is instaled locally for the application.
+
+    openshifter-download
 
 ### Step 4
 
@@ -28,18 +46,50 @@ At the setup time and whenever you add gems to your Gemfile, just run
 
 	openshifter-bundle
 
-to vendor your gems locally.
+gems will be venoder in .openshift folder and you have to add them to VCS.
 
 ### Step 5
 
 Add, commit and push to openshift.
 
+## Upgrading
+
+### OpenShifter
+
+For remote install just run
+
+    openshifter-setup --upgrade
+
+for vendored install it's more complicated
+
+    openshifter-setup --upgrade
+    openshifter-download
+    openshifter-bundle
+
+**will be simplified in the future version**
+
+### JRuby
+
+For remote install, just modify .openshift/openshifter configuration.
+
+For vendor install modify .openshift/openshifter configuration and then run.
+
+    openshifter-download
+
 ## Interface
 
 Setup the environment
 
 	openshifter-setup
 
+To upgrade openshifter
+
+    openshifter-setup --upgrade
+
+Download JRuby and environment libraries
+
+    openshifter-download
+
 Bundler wrapper
 
 	openshifter-bundle
@@ -70,4 +120,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

data/ROADMAP.md

@@ -1,4 +1,4 @@
 ## Expected features
 
-* add possibilty to download JRuby on OpenShift instead of vendoring
+* clean up the code
 * ensure compatibility with other frameworks (Rails)

data/bin/openshifter-bundle

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/openshifter/init', __FILE__)
 
-exec("java -jar .openshift/lib/jruby.jar -S bundle #{$*.join(' ')}")
+if CONFIG['install'] == 'remote'
+    puts '-> Can not be used with remote install.'
+    exit(0)
+end
+
+exec("java -jar .openshift/lib/jruby-#{CONFIG['jruby']}.jar -S bundle #{$*.join(' ')}")

data/bin/openshifter-clean

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/openshifter/init', __FILE__)
 
+if CONFIG['install'] == 'remote'
+    puts '-> Can not be used with remote install.'
+    exit(0)
+end
+
 puts '-> Removing jRuby'
 `rm -rf .openshift/lib`
 

data/bin/openshifter-download

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require File.expand_path('../../lib/openshifter/init', __FILE__)
+
+if CONFIG['install'] == 'remote'
+    puts '-> Can not be used with remote install.'
+    exit(0)
+end
+
+puts "-> Downloading jRuby #{CONFIG['jruby']}"
+`curl -o .openshift/lib/jruby-#{CONFIG['jruby']}.jar "http://jruby.org.s3.amazonaws.com/downloads/#{CONFIG['jruby']}/jruby-complete-#{CONFIG['jruby']}.jar"`
+
+puts "-> Downloading jRuby-Rack #{CONFIG['jrack']}"
+`curl -o .openshift/lib/jruby-rack.jar "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
+
+puts '-> Installing Bundler'
+puts `java -jar .openshift/lib/jruby-#{CONFIG['jruby']}.jar -S gem install bundler --no-ri --no-rdoc`

data/bin/openshifter-gem

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/openshifter/init', __FILE__)
 
-exec("java -jar .openshift/lib/jruby.jar -S gem #{$*.join(' ')}")
+if CONFIG['install'] == 'remote'
+    puts '-> Can not be used with remote install.'
+    exit(0)
+end
+
+exec("java -jar .openshift/lib/jruby-#{CONFIG['jruby']}.jar -S gem #{$*.join(' ')}")

data/bin/openshifter-ruby

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/openshifter/init', __FILE__)
 
-exec("java -jar .openshift/lib/jruby.jar #{$*.join(' ')}")
+if CONFIG['install'] == 'remote'
+    puts '-> Can not be used with remote install.'
+    exit(0)
+end
+
+exec("java -jar .openshift/lib/jruby-#{CONFIG['jruby']}.jar #{$*.join(' ')}")

data/bin/openshifter-setup

@@ -1,28 +1,29 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/openshifter/init', __FILE__)
 
+if File.exists?('.openshift/openshifter') and !ARGV.include?('--upgrade')
+    puts '-> You are already set up.'
+    exit(0)
+end
+  
 unless File.exists?('.openshift/openshifter')
-  puts '-> Removing default .openshift directory'
-  FileUtils.rm_rf('.openshift')
-
-  puts '-> Copying openshifter .openshift direcotry'
-  FileUtils.cp_r(File.expand_path('../../templates/openshift', __FILE__), '.openshift')
-
-  puts '-> Cleaning other default mess'
-  FileUtils.rm_rf('src')
-  FileUtils.rm_rf('pom.xml')
-  FileUtils.rm_rf('README')
+    puts '-> Cleaning default mess'
+    FileUtils.rm_rf('src')
+    FileUtils.rm_rf('pom.xml')
+    FileUtils.rm_rf('README')
+    FileUtils.rm_rf('deployments')
+else
+    config = File.read('.openshift/openshifter')
 end
 
-unless File.exists?('.openshift/lib/jruby.jar')
-  puts "-> Downloading jRuby"
-  `curl -o .openshift/lib/jruby.jar "http://jruby.org.s3.amazonaws.com/downloads/1.6.6/jruby-complete-1.6.6.jar"`
-end
+puts '-> Removing .openshift directory'
+FileUtils.rm_rf('.openshift')
+
+puts '-> Copying .openshift directory'
+FileUtils.cp_r(File.expand_path('../../templates/openshift', __FILE__), '.openshift')
 
-unless File.exists?('.openshift/lib/jruby-rack.jar')
-  puts "-> Downloading jRuby-Rack"
-  `curl -o .openshift/lib/jruby-rack.jar "http://repository.codehaus.org/org/jruby/rack/jruby-rack/1.1.3/jruby-rack-1.1.3.jar"`
+File.open('.openshift/openshifter', 'w') do |file|
+    file.print(config)
 end
 
-puts '-> Installing Bundler'
-puts `java -jar .openshift/lib/jruby.jar -S gem install bundler --no-ri --no-rdoc`
+puts '-> You may change the configuration in .openshift/openshifter file.'

data/lib/openshifter/init.rb

@@ -1,8 +1,27 @@
 require 'fileutils'
+require 'yaml'
+
+$: << File.expand_path('../..', __FILE__)
 
 unless File.exists?('.openshift')
 	puts '--> Invalid direcotry - no .openshift directory'
 	exit(1)
+else
+    data = File.exists?('.openshift/openshifter') ? YAML.load_file('.openshift/openshifter') : nil
+    data = {} unless data
+    CONFIG = data
 end
 
-ENV['GEM_PATH'] = ENV['GEM_HOME'] = File.expand_path('.openshift/gems')
+CONFIG['jruby'] ||= '1.6.6'
+CONFIG['jrack'] ||= '1.1.3'
+CONFIG['install'] ||= 'vendor'
+
+ENV['GEM_PATH'] = ENV['GEM_HOME'] = File.expand_path('.openshift/gems')
+
+def run(cmd)
+  io = IO.popen(cmd)
+  io.each do |line|
+    puts "*> #{line}"
+  end
+  Process.wait(io.pid)
+end

data/lib/openshifter/version.rb

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

data/templates/openshift/action_hooks/build

@@ -1,16 +1,39 @@
 #!/usr/bin/env ruby
 
+$stdout.sync = true
+
 require 'fileutils'
+require 'yaml'
+require 'digest'
 
 FileUtils.cd(ENV['OPENSHIFT_REPO_DIR'])
 
+data = YAML.load_file('.openshift/openshifter')
+data = {} unless data
+CONFIG = data
+
+CONFIG['jruby'] ||= '1.6.6'
+CONFIG['install'] ||= 'vendor'
+CONFIG['jrack'] ||= '1.1.3'
+
 ROOT=File.join(ENV['OPENSHIFT_REPO_DIR'], 'deployments')
 TARGET = File.join(ROOT, 'application.war')
 TARGET_META = File.join(TARGET, 'META-INF')
 TARGET_WEB = File.join(TARGET, 'WEB-INF')
 
-puts '-> Cleaning target'
+libs = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'libs')
+gems = case CONFIG['install']
+  when 'vendor'
+    File.expand_path('.openshift/gems')
+  when 'remote'
+    File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'gems')
+end
+jruby = File.join(libs, "jruby-#{CONFIG['jruby']}.jar")
+jrack = File.join(libs, "jruby-rack-#{CONFIG['jrack']}.jar")
+gemfile_hash = File.join(ENV['OPENSHIFT_DATA_DIR'], 'jruby', 'Gemfile.hash')
+ENV['GEM_PATH'] = ENV['GEM_HOME'] = gems
 
+puts '-> Cleaning target'
 FileUtils.rm_rf(ROOT)
 
 puts '-> Creating target'
@@ -34,7 +57,7 @@ end
 puts '--> init.rb'
 File.open(File.join(TARGET_META, 'init.rb'), 'w') do |file|
     data = <<EOF
-ENV['GEM_HOME'] ||= $servlet_context.getRealPath('/WEB-INF/gems')
+ENV['GEM_HOME'] ||= '#{gems}'
 ENV['BUNDLE_GEMFILE'] = 'Gemfile'
 ENV['RACK_ENV'] = 'production'
 require 'psych.rb' # Hack for Ruby 1.6.6
@@ -52,14 +75,59 @@ app.delete('public')
 app.delete('deployments')
 FileUtils.cp_r(app, TARGET_WEB)
 
-puts '--> Gems'
-FileUtils.cp_r('.openshift/gems', File.join(TARGET_WEB, 'gems'))
-
 puts '--> Lib'
 FileUtils.mkdir_p(File.join(TARGET_WEB, 'lib'))
 
 puts '--> Copy runtime'
-FileUtils.cp(Dir.glob('.openshift/lib/*.jar'), File.join(TARGET_WEB, 'lib'))
+case CONFIG['install']
+  when 'vendor'
+    FileUtils.cp(Dir.glob('.openshift/lib/*.jar'), File.join(TARGET_WEB, 'lib'))
+  when 'remote'
+    FileUtils.mkdir_p(libs)
+    FileUtils.mkdir_p(gems)
+    unless File.exists?(jruby)
+      Dir.glob(File.join(libs, "jruby-*")) do |file|
+        FileUtils.rm(file)
+      end
+      puts "---> Downloading jRuby #{CONFIG['jruby']}"
+      puts `curl -o #{jruby} "http://jruby.org.s3.amazonaws.com/downloads/#{CONFIG['jruby']}/jruby-complete-#{CONFIG['jruby']}.jar"`
+    end
+    unless File.exists?(jrack)
+      Dir.glob(File.join(libs, "jruby-rack-*")) do |file|
+        FileUtils.rm(file)
+      end
+      puts "---> Downloading jRuby-Rack #{CONFIG['jrack']}"
+      puts `curl -o #{jrack} "http://repository.codehaus.org/org/jruby/rack/jruby-rack/#{CONFIG['jrack']}/jruby-rack-#{CONFIG['jrack']}.jar"`
+    end
+    puts '---> Copying libraries'
+    FileUtils.cp(Dir.glob(File.join(libs, '*.jar')), File.join(TARGET_WEB, 'lib'))
+  else
+    puts '---> Unsupported installation.'
+end
+
+puts '--> Gems'
+case CONFIG['install']
+  when 'vendor'
+    # No actions needed
+  when 'remote'
+    gemfile = Digest::SHA256.file('Gemfile').hexdigest
+    oldhash = File.exists?(gemfile_hash) ? File.read(gemfile_hash) : ''
+    unless gemfile == oldhash
+      puts '---> Cleaning gems'
+      FileUtils.rm_rf(gems)
+      puts '---> Installing Bundler'
+      io = IO.popen("java -jar #{jruby} -S gem install bundler --no-ri --no-rdoc")
+      io.each_line { |line| puts "----> #{line}"}
+      Process.wait(io.pid)
+      puts "---> Bundling gems"
+      io = IO.popen("java -Xmx384m -Xss512k -XX:+UseCompressedOops -jar #{jruby} -S bundle install")
+      io.each_line { |line| puts "----> #{line}"}
+      Process.wait(io.pid)
+      File.open(gemfile_hash, 'w') { |file| file.print(gemfile) }
+    end
+  else
+    puts '---> Unsupported installation.'
+end
 
 puts '--> jboss-web.xml'
 File.open(File.join(TARGET_WEB, 'jboss-web.xml'), 'w') do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openshifter
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies: []
 description: Simplify deployments of Sinatra applications using JRuby to OpenShift
 email:
@@ -17,6 +17,7 @@ email:
 executables:
 - openshifter-bundle
 - openshifter-clean
+- openshifter-download
 - openshifter-gem
 - openshifter-ruby
 - openshifter-setup
@@ -25,6 +26,7 @@ extra_rdoc_files: []
 files:
 - bin/openshifter-bundle
 - bin/openshifter-clean
+- bin/openshifter-download
 - bin/openshifter-gem
 - bin/openshifter-ruby
 - bin/openshifter-setup