pacer 2.0.4.pre-java → 2.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8f9ea6540733bd10016d860f63f163db353792
-  data.tar.gz: 359febf17e50d2c627243faa288e9f4a69181be1
+  metadata.gz: c92a63098a4721ec7d8222ca84f2a590d401763d
+  data.tar.gz: 998c4250d82f63e8b5dd6eab0f709cdff4162637
 SHA512:
-  metadata.gz: 6ddf0f9eb5a7a1ef005e68024c6f96af2df8107e92a80e7dab5d5645282294cb7066f49f25abebcde53712414a64104c1f81249b9e8a3c2590f3a59e0116611b
-  data.tar.gz: 9eb6c58fdda3202253260738855d05a7e12e112cdc14b7dde18bac0810ca6cfcbe1a193160f24816e9ed27b5248ac6422ab882d593619226e32e2a8c8914b604
+  metadata.gz: 97833f79fd88d8aea018e19b124d9b7366e3ae682c01073bc1dc8aeb259d1266c431e99039367d7404a94c6b4f50d266e6513230cfa0768d7e4213b3e4bc72ea
+  data.tar.gz: ddb0377e083bc3ac020908b3870e1f59456824c313fd4607c191b4c183eec66bceaefd59fceac5f3be130f70394ae3b633d1d7b02a9aa04a52e354c1119b3f4b

data/Gemfile

@@ -10,7 +10,6 @@ group :development do
   gem 'rake'
   gem 'autotest-standalone'
   gem 'autotest-growl'
-  gem 'pry'
   gem 'awesome_print', '0.4.0'
   gem 'coveralls', require: false
 end

data/Gemfile-custom.x

@@ -0,0 +1,42 @@
+group :development do
+  # pacer-* gems are required for testing pacer.
+  # If you have the gem repos cloned locally, we'll use them.
+  #
+  # Note: when testing orient, use the jruby --headless option to prevent the ui window BS.
+  [ 'pacer-orient', 'pacer-dex' ].each do |lib|
+    if File.directory? "../#{lib}"
+      gem lib, :path => "../#{lib}" 
+    end
+  end
+
+  # Neo4j versions are mutually incompatible
+  # To test Pacer against Neo4j 1.x when the neo2 gem is present, use:
+  #
+  #   neo=1 bundle
+  #   rspec
+  #
+  # To switch back, just use:
+  #
+  #   bundle
+  #   rspec
+  #
+
+  neo_test_ver = ENV.fetch('neo') do
+    if File.directory?("../pacer-neo4j2")
+      '2'
+    elsif File.directory?("../pacer-neo4j")
+      '1'
+    else
+      '0'
+    end
+  end
+  if neo_test_ver == '1'
+    gem 'pacer-neo4j', :path => "../pacer-neo4j"
+  elsif neo_test_ver == '2'
+    gem 'pacer-neo4j2', :path => "../pacer-neo4j2"
+  end
+
+  if File.directory? "../mcfly"
+    gem 'pacer-mcfly', :path => "../mcfly" 
+  end
+end

data/lib/pacer/support/lock_jar.rb

@@ -1,33 +1,13 @@
-# TODO: Remove when https://github.com/jmhedden/lock_jar/pull/1 is merged.
 module LockJar
-  # Add a Jarfile to be included when LockJar.lock_registered_jarfiles is called.
-  #
-  # @param [String] jarfile path to register
-  # @return [Array] All registered jarfiles
-  def self.register_jarfile( jarfile )
-    fail "Jarfile not found: #{ jarfile }" unless File.exists? jarfile
-    @@registered_jarfiles ||= []
-    @@registered_jarfiles << jarfile
-  end
-
-  # Lock the registered Jarfiles and generate a Jarfile.lock.
-  #
-  # Options and groups are passed through to the LockJar.lock method, but
-  # if a jarfile is specified, it will be ignored. Use LockJar.register_jarfile
-  # to add dependencies.
-  #
-  # A block can be passed in, overriding values from the Jarfiles.
-  #
-  # @return [Hash] Lock data
-  def self.lock_registered_jarfiles( *args, &blk )
-    jarfiles = @@registered_jarfiles || []
-    instances = jarfiles.map do |jarfile|
-      LockJar::Domain::JarfileDsl.create jarfile
-    end
-    combined = instances.reduce do |result, inst|
-      LockJar::Domain::DslHelper.merge result, inst
+  # If Bundler constant is defined, assume we are running in a bundled environment and
+  # register all Jarfiles
+  def self.register_bundled_jarfiles
+    if defined? Bundler
+      Gem::Specification.
+        map { |s| File.join(s.full_gem_path, 'Jarfile') }.
+        select { |f| File.exists? f }.
+        each { |f| LockJar.register_jarfile f }
+      true
     end
-    args = args.reject { |arg| arg.is_a? String }
-    lock combined, *args, &blk
   end
 end

data/lib/pacer/support/lock_jar_disabler.rb

@@ -0,0 +1,13 @@
+# Disable LockJar so that other libraries can't bring in random other jars.
+# TODO: add LockJar.disable! or something like that.
+#
+# NOTE: this file should only be loaded by #register_bundled_jarfiles after loading is complete.
+module LockJar
+  class << self
+    alias orig_lock lock
+    alias orig_load load
+  end
+  def self.lock(*a); end
+  def self.load(*a); end
+end
+

data/lib/pacer/version.rb

@@ -1,7 +1,6 @@
 module Pacer
-  VERSION = "2.0.4.pre"
-  JARFILES = []
-  # Clients may also optionally define the following constants in the Pacer namespace:
+  VERSION = "2.0.6"
+  # Clients may optionally define the following constants in the Pacer namespace:
   # - LOAD_JARS : set to false to manage jar loading in the client. Be sure to load the jars defined in JARFILES.
   # - LOCKJAR_LOCK_OPTS : set some options to be passed to LockJar.lock (ie. :lockfile, :download_artifacts, :local_repo)
   unless const_defined? :START_TIME

data/lib/pacer.rb

@@ -24,26 +24,28 @@ require 'rubygems'
 require 'lock_jar'
 require 'pacer/support/lock_jar'
 
-module Pacer
-  def self.load_dependencies!
-    Pacer::JARFILES.each do |jarfile|
-      LockJar.register_jarfile(jarfile)
-    end
-    if (not defined? Pacer::LOAD_JARS) or Pacer::LOAD_JARS == true
-      if defined? Pacer::LOCKJAR_OPTS
-        LockJar.lock_registered_jarfiles LOCKJAR_OPTS
-        LockJar.load LOCKJAR_OPTS
-      else
-        LockJar.lock_registered_jarfiles
-        LockJar.load
-      end
+if (not defined? Pacer::LOAD_JARS) or Pacer::LOAD_JARS == true
+  bundle_jarfiles = LockJar.register_bundled_jarfiles # defined in pacer/support/lock_jar.rb
+  unless bundle_jarfiles
+    LockJar.register_jarfile(File.join(File.dirname(__FILE__), "..", "Jarfile"))
+  end
+  if defined? Pacer::LOCKJAR_OPTS
+    LockJar.lock_registered_jarfiles LOCKJAR_OPTS
+    LockJar.load LOCKJAR_OPTS
+  else
+    if bundle_jarfiles
+      LockJar.lock_registered_jarfiles lockfile: 'Jarfile.lock'
+      LockJar.load 'Jarfile.lock'
+    else
+      LockJar.lock_registered_jarfiles lockfile: 'Jarfile.pacer.lock'
+      LockJar.load 'Jarfile.pacer.lock'
     end
   end
+  if bundle_jarfiles
+    require 'pacer/support/lock_jar_disabler'
+  end
 end
 
-LockJar.register_jarfile(File.join(File.dirname(__FILE__), "..", "Jarfile"))
-Pacer.load_dependencies!
-
 module Pacer
   unless const_defined? :PATH
     PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))

data/pacer.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.add_dependency "lock_jar", "~> 0.10.0"
+  s.add_dependency "lock_jar", "~> 0.10.2"
   s.add_development_dependency 'xn_gem_release_tasks'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 2.0.4.pre
+  version: 2.0.6
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lock_jar
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,7 @@ files:
 - CONTRIBUTORS
 - Gemfile
 - Gemfile-custom.sample
+- Gemfile-custom.x
 - Jarfile
 - LICENSE.txt
 - README.md
@@ -154,6 +155,7 @@ files:
 - lib/pacer/support/enumerable.rb
 - lib/pacer/support/hash.rb
 - lib/pacer/support/lock_jar.rb
+- lib/pacer/support/lock_jar_disabler.rb
 - lib/pacer/support/native_exception.rb
 - lib/pacer/support/nil_class.rb
 - lib/pacer/support/proc.rb
@@ -264,9 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9