activefacts 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531ea0cabbbe32609a115efae2fe46e9c8d43d8d
-  data.tar.gz: 518c5306efb9a599a4276d2d5f8765ef8c7fa302
+  metadata.gz: 725fe09847e2e13085dd891cd8f9399f16775135
+  data.tar.gz: b5cf0ea5b1b65c1a7d9d343818ce7c69089692db
 SHA512:
-  metadata.gz: 1ad369a71b0cce0fd21cc072b598a2a0a47090267495d300f2b7795cdaf7992eb7e56a67f521bf799b102a595026d7b6cdbbdb43860a2da123e990633a9d2976
-  data.tar.gz: f2e462c39da877390353119491bd6ec0b6eb01e252bda45e0bcc8f9273d5ab6af037e6699e4f0cfba3c0dba500a6c36c208b15b274b01629fc949b683ad61f9a
+  metadata.gz: ba7e3db759ecede9142cf67f69231f25ade297ef06877d9042a274088a30a29092d38d8c9c3501892e7ed1b22a9afc0972dbfcf34b61ca1ea2441d74c604e8a0
+  data.tar.gz: ea77ba019ee5e084828625f084dce22f244ac030fc21364dfffad32d595528ca95d4fad973c16fd07b4ae4a7fd4aa37bd47ff94f984e160c10660d5f72bef1df

data/Gemfile

@@ -2,11 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A/Users/cjh/work/activefacts}
+if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
+  puts "Using work area gems for #{File.basename(File.dirname(__FILE__))}"
   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-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'

data/bin/afgen

@@ -17,16 +17,9 @@ arg = ARGV.shift || "--help"
 while arg =~ /^--([^=]*)(?:=(.*))?/
   module_name, options = $1, ($2||"").split(/,/)
   begin
-    base_generators = ActiveFacts::Registry.generators.keys
-
     require "activefacts/generators/#{module_name}"
 
-    # One require may load more than one generator. Extract new ones.
-    new_generators = ActiveFacts::Registry.generators
-    generators += (new_generators.keys-base_generators).map do |gn|
-      [new_generators[gn], options]
-    end
-
+    generators += Array(ActiveFacts::Registry.generators[module_name])
   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 = 7
-    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.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler