euston-eventstore 1.0.2 → 1.0.3

data/Rakefile

@@ -32,8 +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
+  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
 
 #############################################################################
@@ -44,8 +67,8 @@ end
 
 default_rspec_opts = %w[--colour --format Fuubar]
 
-desc "Run all the specs"
-RSpec::Core::RakeTask.new do |t|
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = default_rspec_opts
 end
 
@@ -55,24 +78,38 @@ end
 #
 #############################################################################
 
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+def built_gem
+  @built_gem ||= Dir["#{name}*.gem"].first
+end
+
+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/#{name}-#{version}.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}"
-  sh "mv #{gem_file} pkg"
+  sh "mv #{built_gem} pkg"
 end
 
 desc "Generate #{gemspec_file}"

data/euston-eventstore.gemspec

@@ -1,8 +1,8 @@
 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::RUBY
+  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']
   s.summary     = %q{Event store for use with Euston.}
@@ -10,8 +10,6 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/leemhenson/euston-eventstore'
   # = MANIFEST =
   s.files = %w[
-    Gemfile
-    Gemfile.lock
     Rakefile
     euston-eventstore.gemspec
     lib/euston-eventstore.rb
@@ -52,6 +50,17 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport',             '~> 3.0.9'
   s.add_dependency 'hash-keys',                 '~> 1.0.0'
   s.add_dependency 'require_all',               '~> 1.2.0'
+  s.add_dependency 'uuid',                      '~> 2.3.0'
+
+  if RUBY_PLATFORM.to_s == 'java'
+    s.add_dependency 'json-jruby',              '~> 1.5.0'
+    s.add_dependency 'jmongo',                  '~> 1.0.0'
+  else
+    s.add_dependency 'bson_ext',                '~> 1.1.0'
+    s.add_dependency 'json',                    '~> 1.5.0'
+    s.add_dependency 'mongo',                   '~> 1.3.1'
+  end
+
   s.add_development_dependency 'awesome_print', '~> 0.4.0'
   s.add_development_dependency 'fuubar',        '~> 0.0.0'
   s.add_development_dependency 'rspec',         '~> 2.6.0'

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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: euston-eventstore
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &82073940 !ruby/object:Gem::Requirement
+  requirement: &69028700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *82073940
+  version_requirements: *69028700
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  requirement: &82073500 !ruby/object:Gem::Requirement
+  requirement: &69028180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82073500
+  version_requirements: *69028180
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &82073020 !ruby/object:Gem::Requirement
+  requirement: &69027390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,54 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82073020
+  version_requirements: *69027390
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &69026670 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *69026670
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &69026120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *69026120
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &69025580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *69025580
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: &69025080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *69025080
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &82072460 !ruby/object:Gem::Requirement
+  requirement: &69024720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +99,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *82072460
+  version_requirements: *69024720
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &82071940 !ruby/object:Gem::Requirement
+  requirement: &69024240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +110,10 @@ dependencies:
         version: 0.0.0
   type: :development
   prerelease: false
-  version_requirements: *82071940
+  version_requirements: *69024240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82071190 !ruby/object:Gem::Requirement
+  requirement: &69023880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +121,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *82071190
+  version_requirements: *69023880
 description: Ruby port for Jonathan Oliver's EventStore. See https://github.com/joliver/EventStore
   for details.
 email:
@@ -87,8 +131,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - Rakefile
 - euston-eventstore.gemspec
 - lib/euston-eventstore.rb

data/Gemfile

@@ -1,15 +0,0 @@
-source :rubygems
-gemspec
-
-platforms :ruby do
-  gem 'bson_ext',     '~> 1.1'
-  gem 'json',         '~> 1.5'
-  gem 'mongo',        '~> 1.3.1'
-  gem 'uuid',         '~> 2.3'
-end
-
-
-platforms :jruby do
-  gem 'json-jruby',   '~> 1.5'
-  gem 'jmongo',       '~> 1.0'
-end

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    euston-eventstore (1.0.1)
-      activesupport (~> 3.0.9)
-      hash-keys (~> 1.0.0)
-      require_all (~> 1.2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.10)
-    awesome_print (0.4.0)
-    bson (1.3.1)
-    bson_ext (1.3.1)
-    diff-lcs (1.1.3)
-    fuubar (0.0.6)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.1.8)
-      ruby-progressbar (~> 0.0.10)
-    hash-keys (1.0.0)
-    jmongo (1.0.2)
-      require_all (~> 1.2)
-    json (1.5.0)
-    json (1.5.0-java)
-    json-jruby (1.5.0-java)
-      json (= 1.5.0)
-    macaddr (1.4.0)
-      systemu (~> 2.2.0)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    require_all (1.2.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.8)
-    rspec-mocks (2.6.0)
-    ruby-progressbar (0.0.10)
-    systemu (2.2.0)
-    uuid (2.3.4)
-      macaddr (~> 1.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  awesome_print (~> 0.4.0)
-  bson_ext (~> 1.1)
-  euston-eventstore!
-  fuubar (~> 0.0.0)
-  jmongo (~> 1.0)
-  json (~> 1.5)
-  json-jruby (~> 1.5)
-  mongo (~> 1.3.1)
-  rspec (~> 2.6.0)
-  uuid (~> 2.3)