activefacts 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536b945cf42000649fad6040c13d81c0eeb3f426
-  data.tar.gz: 6e20e11671cc7e6dfd868bd041de4dd003a44e85
+  metadata.gz: 91f7add2a5111c7fe09629f5ed6d37cb17351b49
+  data.tar.gz: b25001ddc8362fe360c21df36e097a56632b6346
 SHA512:
-  metadata.gz: ac57a8557fe54365c304953a277c01c197545b525b7a48746835dbb5a9dd6c805c56c294b044a5c3e1e4a0d1434f81a521a5066272cb344cd7931b4e3588ab89
-  data.tar.gz: 85fda37a8edd7619ea2dbd47a828596c749430dad25e23a8d8a25a06695763642d76108033cc0aba0aab22ebf7d5a08dcfaa60d752c2b9fc975b7e3243cfe1c1
+  metadata.gz: aef847e75eb62a85a810b3b781f68cb84df3392551e4890bc7b2d78c4c4cfdbdd3b56584f0c09d8506cb404388593693af6fe1e74dbf22791bd4eba670f65f28
+  data.tar.gz: bcd6529d8e98e6a8257962f22d544d9f2eb678daa7186b86b59f6e1ad17fd1f394de6ac9ae51017d95a56205cdfe4acbacbbb8add02cd4413a2f106f3d40370c

data/Gemfile

@@ -2,14 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
-  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts"
-  gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
-  gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
-  gem 'activefacts-cql', path: '/Users/cjh/work/activefacts/cql'
-  gem 'activefacts-orm', path: '/Users/cjh/work/activefacts/orm'
-  gem 'activefacts-rmap', path: '/Users/cjh/work/activefacts/rmap'
-  #gem 'activefacts-compositions', path: '/Users/cjh/work/activefacts/compositions'
-  gem 'activefacts-generators', path: '/Users/cjh/work/activefacts/generators'
-  gem 'activefacts-examples', path: '/Users/cjh/work/activefacts/examples'
+this_file = File.absolute_path(__FILE__)
+if this_file =~ %r{\A#{ENV['HOME']}}i
+  dir = File.dirname(File.dirname(this_file))
+  $stderr.puts "Using work area gems in #{dir} from activefacts"
+  gem 'activefacts-api', path: dir+'/api'
+  gem 'activefacts-metamodel', path: dir+'/metamodel'
+  gem 'activefacts-cql', path: dir+'/cql'
+  gem 'activefacts-orm', path: dir+'/orm'
+  gem 'activefacts-rmap', path: dir+'/rmap'
+  gem 'activefacts-generators', path: dir+'/generators'
+  gem 'activefacts-examples', path: dir+'/examples'
+  #gem 'activefacts-compositions', path: dir+'/compositions'
 end

data/activefacts.gemspec

@@ -25,7 +25,7 @@ fact models in CQL and generates relational and object models in SQL, Ruby and o
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
+  spec.add_development_dependency "bundler", ">= 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 

data/bin/afgen

@@ -19,7 +19,7 @@ while arg =~ /^--([^=]*)(?:=(.*))?/
   begin
     require "activefacts/generators/#{module_name}"
 
-    generators += Array(ActiveFacts::Registry.generators[module_name])
+    generators << [ActiveFacts::Registry.generators[module_name], options]
   rescue LoadError => e
     $stderr.puts "Could not find output module #{module_name}. Try --help"
     exit 1

data/lib/activefacts/version.rb

@@ -8,7 +8,7 @@ module ActiveFacts
   module Version
     MAJOR = 1
     MINOR = 8
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A fact modeling and query language (CQL) and application runtime (the Constellation