omf_ec 6.1.9.pre.3 → 6.1.9.pre.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4fb7b8aaaec98f0e0002f6bf0acc04ddc7194c0a
-  data.tar.gz: 53e1f7bccb0fffde50263c3e1d960346a64ae541
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWRmYmZjZjVjZjg1NmIwOTVhMTk4MGFmNWMwY2FiYmE2YmIyZGJhYg==
+  data.tar.gz: !binary |-
+    M2NmZmNiYWY2Y2NhYTdkNWFjZGY5ZGYzZjE1MDFmODgzZWM5ZjdjNA==
 SHA512:
-  metadata.gz: d3cbd93c704afc74f0029a6826f8849308670ed0801a71ee6ce75fbff4b6cd6a4c8bc723a9a5e0d8e022979bfc0f79ff92a6f281a7571f90699afe80312bad9e
-  data.tar.gz: 2c0570b792f82fd1db7dc3f24b0de305fcc1a276133f5c0b9be3592edc3019380550e135054f354d9a485f578d66baf2f4ff0fa85deb8f6901ddc7e03a634b65
+  metadata.gz: !binary |-
+    MjY1NGYxY2VmOTNlYzBhMTlkMjAzMjNiYTM0OTQzMGZhNzc1M2NjY2VlOTc4
+    OTI5MTU1ZTNjZDFiMDExYjYxYTc5ZWZiMTdmNWE0NTYxN2FlN2Q0OGZiM2Ey
+    ZmY4NTEzNGIxMjAyMzFlODFjMzFhMjNhZWVjYzFjZDYzZDU2NDA=
+  data.tar.gz: !binary |-
+    MTgyMGYyMmQ5ZjE0NzU3MDY1OGNmYzhlN2FjM2U1ZDhiOTljMjY5ODY4Zjdi
+    MmZlM2Q3YTU3NGM1YzgzMWVlMjU0NGM4YWM1ZWRkNmZiYjUyMTUxOWJlZDM4
+    YzgzZjI5OWIzZDFjYmFhMzU5NGFlYTZmOGY4NWFhMjYxNjVjMTM=

data/lib/omf_ec/dsl.rb

@@ -341,6 +341,7 @@ module OmfEc
       require 'json'
       require 'net/http'
       begin
+        query = query.sql if query.kind_of? OmfEc::Graph::MSBuilder
         # Create a Measurement Point for that Job item
         unless OmfEc.experiment.job_mps.include?(query)
           mp = { name: "#{Time.now.to_i}", sql: query }
@@ -368,7 +369,9 @@ module OmfEc
         end
         return data
       rescue Exception => ex
-        error "def_query - #{ex}"
+        return nil if ex.kind_of? EOFError
+        error "def_query - #{ex} (#{ex.class})"
+        error "def_query - #{ex.backtrace.join("\n\t")}"
         return nil
       end
     end
@@ -390,9 +393,8 @@ module OmfEc
       else
         warn "Measurement point '#{ms_name}' NOT defined"
       end
-      def_query(msb.sql)
+      msb
     end
 
-
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.9.pre.3
+  version: 6.1.9.pre.4
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: evented-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,26 +86,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9.pre.3
+        version: 6.1.9.pre.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9.pre.3
+        version: 6.1.9.pre.4
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Experiment controller of OMF, a generic framework for controlling and
@@ -178,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 2.1.11
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: OMF experiment controller