hsql 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f4bf6d7898b093c37c45d8ba77bbc0e118cd56
-  data.tar.gz: b2a275351fecde1842b35385e4845ff2a849cabf
+  metadata.gz: d0b1d10006e41de74e480422871f77ce7770c985
+  data.tar.gz: adf5420beded1734f2d4e33c82d90d673a7fe320
 SHA512:
-  metadata.gz: ff13992845af044851e1f408ea434909e8b7cabb684a731e58535e33376870708b40edab68372f0d829ad3481614582cb3a3d477a0a347d8eedf036ab7d71dd7
-  data.tar.gz: 432d09d96805356507658107826a6bea4c6f61504c42c0341ebf539065507997ad2b4c003786826fbcf7418a36b06613352e9ce4a6d53780d7e222bcb78b8d20
+  metadata.gz: 518e45b1f4e3a5841e55e54126169f0a38bac3230fad17b485c348ab3efd1e0c4debc1790ef2a00c8393bc993c3e62474e5ae8f087e73b55fd7e44fa38de0129
+  data.tar.gz: 326cd1909458d927e713ff26a6651fb4288f9e8bf17296d9026e0fd40388f3476ea5e9ed90cb51403ec67f7a801a6045fd54cdd4c1a51e8e16339e0412a64418

data/Rakefile

@@ -2,9 +2,18 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-RSpec::Core::RakeTask.new
+ROOT = File.expand_path('../', __FILE__)
+
 RuboCop::RakeTask.new
 
+# Avoiding RSpec::Core::RakeTask.new
+# because we want to run each spec individually. Slower startup time but it
+# allows us to ensure there are no missing dependencies.
+task :spec do
+  Dir["#{ROOT}/spec/**/*_spec.rb"].each do |spec|
+    exit 1 unless system("bundle exec rspec -f d -bc #{spec}")
+  end
+end
 task default: [:lint, :spec]
 task test: :spec
 task lint: :rubocop

data/bin/hsql

@@ -83,9 +83,9 @@ require_relative '../lib/hsql'
 
 file = HSQL::File.parse_file(file, options)
 if 'yaml' == options[:meta_only]
-  puts file.metadata.to_yaml
+  puts file.to_yaml
 elsif 'json' == options[:meta_only]
-  puts file.metadata.to_json
+  puts file.to_json
 else
   file.queries.each do |query|
     # Runs the query through the parser and then deparses it

data/lib/hsql/file.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require_relative 'query'
 require_relative 'data'
+require_relative 'template'
 module HSQL
   # HSQL::File parses the input file and provides reader methods to the hash of
   # YAML data from the front matter section and a list of the queries in the SQL
@@ -29,6 +30,14 @@ module HSQL
       parse(file.read, options)
     end
 
+    def to_yaml
+      metadata.to_yaml
+    end
+
+    def to_json
+      metadata.to_json
+    end
+
     def metadata
       @metadata ||= @front_matter ? ::YAML.load(@front_matter) : {}
     end
@@ -60,20 +69,12 @@ module HSQL
 
     def data
       @data ||= begin
-        validate_environment_exists!
-
         hash = metadata['data'] || {}
-        hash = hash[environment] || {} if environment
+        hash = hash.merge(hash[environment] || {})
         hash.merge(Data.for_machines(timestamp))
       end
     end
 
-    def validate_environment_exists!
-      return unless environment
-      return if metadata['data'].blank? || metadata['data'].key?(environment)
-      fail ArgumentError, "The environment #{environment.inspect} is not specified"
-    end
-
     def interpolate_data!
       template = Template.new(@sql)
       template.variable_names.each do |name|

data/lib/hsql/version.rb

@@ -1,4 +1,4 @@
 # http://semver.org/
 module HSQL
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hsql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jack Danger Canty