euston-eventstore 1.0.2-java → 1.0.3-java

data/Rakefile

@@ -32,12 +32,31 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+def replace_header(head, header_name, provider = nil)
+  if provider
+    value = send(provider)
+  else
+    value = "'#{send(header_name)}'"
+  end
+
+  provider ||= header_name
+  head.sub!(/(\.#{header_name}\s*= ).*/) { "#{$1}#{value}"}
 end
 
 def platform
-  RUBY_PLATFORM.to_s == 'java' ? '-java' : ''
+  jruby? ? '-java' : ''
+end
+
+def platform_dependant_gem_file
+  "#{name}#{platform}-#{version}.gem"
+end
+
+def platform_dependent_version
+  "'#{version}#{platform}'"
+end
+
+def jruby?
+  RUBY_PLATFORM.to_s == 'java'
 end
 
 #############################################################################
@@ -60,23 +79,33 @@ end
 #############################################################################
 
 def built_gem
-  Dir["#{name}*.gem"].first
+  @built_gem ||= Dir["#{name}*.gem"].first
 end
 
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+desc "Create tag v#{platform_dependent_version} and build and push #{platform_dependant_gem_file} to Rubygems"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
+
+  sh "git commit --allow-empty -a -m 'Release #{platform_dependent_version}'"
+  sh "git tag v#{platform_dependent_version}"
   sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{built_gem}"
+  sh "git push origin v#{platform_dependent_version}"
+
+  command = "gem push pkg/#{platform_dependant_gem_file}"
+
+  if jruby?
+    puts "--------------------------------------------------------------------------------------"
+    puts "can't push to rubygems using jruby at the moment, so switch to mri and run: #{command}"
+    puts "--------------------------------------------------------------------------------------"
+  else
+    sh command
+  end
 end
 
-desc "Build #{gem_file} into the pkg directory"
+desc "Build #{platform_dependant_gem_file} into the pkg directory"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"

data/euston-eventstore.gemspec

@@ -1,8 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-eventstore'
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.date        = '2011-09-15'
-  # s.platform    = Gem::Platform::CURRENT
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']

data/lib/euston-eventstore/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module EventStore
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: euston-eventstore
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.2
+  version: 1.0.3
 platform: java
 authors:
 - Lee Henson