schema_dev 0.1.1 → 0.1.2

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in schema_dev.gemspec
 gemspec
-
-gem 'byebug'

data/Rakefile

@@ -1,2 +1,4 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)

data/lib/schema_dev/config.rb

@@ -5,6 +5,7 @@ require 'its-it'
 require 'key_struct'
 require 'pathname'
 require 'yaml'
+require 'hash_keyword_args'
 
 module SchemaDev
   CONFIG_FILE = "schema_dev.yml"
@@ -13,8 +14,10 @@ module SchemaDev
 
     attr_accessor :quick, :db
 
+    def self._reset ; @@config = nil end  # for use by rspec
+
     def self.load
-      @@config ||= new (YAML.load Pathname.new(CONFIG_FILE).read).deep_symbolize_keys
+      @@config ||= new((YAML.load Pathname.new(CONFIG_FILE).read).deep_symbolize_keys)
     end
 
     class Tuple < KeyStruct[:ruby, :rails, :db]
@@ -34,31 +37,33 @@ module SchemaDev
       end
     end
 
-    def initialize(ruby:, rails:, db: nil, exclude: nil, notify: nil, quick: nil)
-      @ruby = Array.wrap(ruby)
-      @rails = Array.wrap(rails)
-      @db = Array.wrap(db)
-      @exclude = Array.wrap(exclude).map(&:symbolize_keys).map {|tuple| Tuple.new(tuple)}
-      @notify = Array.wrap(notify)
-      @quick = Array.wrap(quick || {ruby: @ruby.last, rails: @rails.last, db: @db.andand.last})
+    def initialize(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
+      opts = opts.keyword_args(ruby: :required, rails: :required, db: nil, exclude: nil, notify: nil, quick: nil)
+      @ruby = Array.wrap(opts.ruby)
+      @rails = Array.wrap(opts.rails)
+      @db = Array.wrap(opts.db)
+      @exclude = Array.wrap(opts.exclude).map(&:symbolize_keys).map {|tuple| Tuple.new(tuple)}
+      @notify = Array.wrap(opts.notify)
+      @quick = Array.wrap(opts.quick || {ruby: @ruby.last, rails: @rails.last, db: @db.andand.last})
     end
 
     def db?
       @db.any?
     end
 
-    def matrix(quick: false, ruby: nil, rails: nil, db: nil)
+    def matrix(opts={}) # once we no longer support ruby 1.9.3, can switch to native keyword args
+      opts = opts.keyword_args(quick: false, ruby: nil, rails: nil, db: nil)
       use_ruby = @ruby
       use_rails = @rails
       use_db = @db
-      if quick
+      if opts.quick
         use_ruby = @quick.map{|q| q[:ruby]}
         use_rails = @quick.map{|q| q[:rails]}
         use_db = @quick.map{|q| q[:db]}
       end
-      use_ruby = Array.wrap(ruby) if ruby
-      use_rails = Array.wrap(rails) if rails
-      use_db = Array.wrap(db) if db
+      use_ruby = Array.wrap(opts.ruby) if opts.ruby
+      use_rails = Array.wrap(opts.rails) if opts.rails
+      use_db = Array.wrap(opts.db) if opts.db
 
       @matrix ||= begin
                     m = use_ruby.product(use_rails)

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/schema_dev.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "fastandand"
+  spec.add_dependency "hash_keyword_args"
   spec.add_dependency "its-it"
   spec.add_dependency "key_struct"
   spec.add_dependency "thor"
-  spec.add_dependency "fastandand"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/config_spec.rb

@@ -10,7 +10,7 @@ describe SchemaDev::Config do
     ]
   end
 
-  it "computes matrix without db" do
+  it "computes matrix with db" do
     config = get_config(ruby: %W[1.9.3 2.1.5], rails: %W[4.0 4.1], db: %W[sqlite3 postgresql])
     expect(config.matrix).to match_array [
       { ruby: "1.9.3", rails: "4.0", db: "sqlite3" },

data/spec/spec_helper.rb

@@ -2,9 +2,10 @@ require 'schema_dev/config'
 require 'tmpdir'
 
 def get_config(data)
+  SchemaDev::Config._reset
   Dir.mktmpdir do |dir|
     Dir.chdir(dir) do
-      Pathname.new(SchemaDev::CONFIG_FILE).write data.to_yaml
+      Pathname.new(SchemaDev::CONFIG_FILE).open("w") {|f| f.write data.to_yaml }
       SchemaDev::Config.load
     end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - ronen barzel
@@ -13,113 +14,145 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: its-it
+  name: fastandand
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: key_struct
+  name: hash_keyword_args
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: its-it
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fastandand
+  name: key_struct
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: SchemaPlus development tools
@@ -130,8 +163,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,26 +188,33 @@ files:
 homepage: https://github.com/SchemaPlus/schema_dev
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2660621629960467623
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2660621629960467623
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: SchemaPlus development tools
 test_files:
 - spec/config_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 288f34fe053bfa408a49183dc22d5698f684206a
-  data.tar.gz: e60699f9146f1f61fdd5aaf1eef35ce8faaf7c81
-SHA512:
-  metadata.gz: 4b9cdcd784ff3fca4fa7de9fb81b4d4a82f9409a83fb4a2ce875aabb730ce9e31335bcd0ddcfd689b42bee96878caa31ae2c46de1474b6bdb5a02e64a5881d48
-  data.tar.gz: 1da66872b03c208d69780ed32b162f7fdc9d91f98689d8c9f16d53a496c94fe291ea989a72207259100cb1defb2bcde370abbd183442bd39a59355d2030f4521