schema_dev 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e6668bceb23523e1553a0f9e471ebc124d0e40
-  data.tar.gz: 9407c2e3d0ced7c676631efe9e2578aa3d7e2c4d
+  metadata.gz: e3dae5713b925a353bc74bb7b9783670586f350c
+  data.tar.gz: 73f1a0ab7b0e913d31311c4296b97e7847ed00de
 SHA512:
-  metadata.gz: 8f10858e559e27e283ad32925ac58960977b27a6bc70320e169cf9875c01638e5cad43fb6f39163835eefcc0c13ab06918940b3180d81ea9e9714a7b09058ccf
-  data.tar.gz: e5b2b82af3c11ef8631133ec188b23e8ff4a5823574eb01ca122e78f3f413410aa382b624872cba127d79e5aacfc2fc8826faf041b772cea86f284692bdd1b7c
+  metadata.gz: aa6d02ba2491b08e1177caf97fdd455853b9f37a887a2537bf8bcf1f44c24528da5f188bb1734e10a13da7a182caf1ba0d1b2d95e065e22da39b3a008d326ae7
+  data.tar.gz: f806f3e86dd8eb20e9d8ab6ec57de80db8c508d67b57de47d9174e18a81f178d0d203a9ec832da86290c67b1724b868ec92fa58acfab957691de9e44a98de0b6

data/lib/schema_dev/gem.rb

@@ -1,8 +1,10 @@
 require 'faraday'
+require 'json'
 require 'fileutils'
 require 'pathname'
 require 'active_support/core_ext/string'
 
+require_relative 'runner'
 require_relative 'templates'
 
 module SchemaDev
@@ -11,12 +13,24 @@ module SchemaDev
       new(name).build
     end
 
-    attr_accessor :gem_name, :gem_module, :gem_root, :fullname, :email
+    attr_accessor :gem_name, :gem_module, :gem_root, :gem_parent_name, :gem_base_name, :gem_lib_path, :fullname, :email
 
     def initialize(name)
       self.gem_name = name.underscore
-      self.gem_module = gem_name.camelize.sub(/^SchemaPlus(?=\w+)/, 'SchemaPlus::')
       self.gem_root = Pathname.new(gem_name)
+      if gem_name =~ /^(schema_plus)_(.*)/
+        parent, base = [$1, $2]
+        self.gem_module = [parent, base].map(&:camelize).join('::')
+        self.gem_lib_path = [parent, base].join('/')
+        self.gem_parent_name = parent
+        self.gem_base_name = base
+        @subdir = true
+      else
+        self.gem_module = gem_name.camelize
+        self.gem_lib_path = gem_name
+        self.gem_base_name = gem_name
+        @subdir = false
+      end
       get_fullname_and_email
     end
 
@@ -26,6 +40,7 @@ module SchemaDev
       copy_template
       self.gem_root = self.gem_root.realpath
       rename_files
+      fixup_subdir if @subdir
       substitute_keys
       freshen
       git_init
@@ -73,6 +88,22 @@ module SchemaDev
       Dir.glob(gem_root + "**/*GEM_NAME*").each do |path|
         FileUtils.mv path, path.gsub(/GEM_NAME/, gem_name)
       end
+      Dir.glob(gem_root + "**/*GEM_BASE_NAME*").each do |path|
+        FileUtils.mv path, path.gsub(/GEM_BASE_NAME/, gem_base_name)
+      end
+    end
+
+    def fixup_subdir
+      libdir = gem_root + "lib"
+      aside = libdir.to_s + "x"
+      subdir = libdir + gem_parent_name
+
+      FileUtils.mv libdir, aside
+      libdir.mkpath
+      FileUtils.mv aside, subdir
+      (gem_root + "lib" + "#{gem_name}.rb").write <<-END.lstrip
+        require_relative '#{gem_parent_name}/#{gem_base_name}.rb'
+      END
     end
 
     def substitute_keys
@@ -84,10 +115,12 @@ module SchemaDev
 
     def subs(s)
       s = s.gsub('%GEM_NAME%', gem_name)
+      s = s.gsub('%GEM_BASE_NAME%', gem_base_name)
+      s = s.gsub('%GEM_LIB_PATH%', gem_lib_path)
       s = s.gsub('%GEM_MODULE%', gem_module)
       s = s.gsub('%FULLNAME%', fullname)
       s = s.gsub('%EMAIL%', email)
-      s = s.gsub('%SCHEMA_MONKEY_DEPENDENCY%', dependency(schema_monkey_version))
+      s = s.gsub('%SCHEMA_PLUS_CORE_DEPENDENCY%', dependency(schema_plus_core_version))
       s = s.gsub('%SCHEMA_DEV_DEPENDENCY%', dependency(SchemaDev::VERSION))
       s = s.gsub('%YEAR%', Time.now.strftime("%Y"))
     end
@@ -99,9 +132,9 @@ module SchemaDev
       dep
     end
 
-    def schema_monkey_version
-      @monkey_version ||= begin
-                            gems = JSON.parse Faraday.get('https://rubygems.org/api/v1/versions/schema_monkey.json').body
+    def schema_plus_core_version
+      @core_version ||= begin
+                            gems = JSON.parse Faraday.get('https://rubygems.org/api/v1/versions/schema_plus_core.json').body
                             gems.reject(&it["prerelease"]).sort_by(&it["number"].split('.')).last["number"]
                           end
     end

data/lib/schema_dev/version.rb

@@ -1,3 +1,3 @@
 module SchemaDev
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/schema_dev.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-given"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

data/spec/gem_spec.rb

@@ -2,63 +2,72 @@ require 'schema_dev/gem'
 
 describe SchemaDev::Gem do
 
-  let(:user_name) { "My Name" }
-  let(:user_email) { "my_name@example.com" }
-
-  before(:each) do
-    stub_request(:get, 'https://rubygems.org/api/v1/versions/schema_monkey.json').to_return body: JSON.generate([
-      { number: "1.0.0.pre", prerelease: true},
-      { number: "0.2.1"},
-      { number: "0.1.2"},
-      { number: "0.1.1" },
-    ])
-    allow_any_instance_of(SchemaDev::Gem).to receive(:`).with("git config user.name").and_return user_name
-    allow_any_instance_of(SchemaDev::Gem).to receive(:`).with("git config user.email").and_return user_email
-  end
-
   around(:each) do |example|
     silence_stream(STDOUT) do
-      example.run
+      silence_stream(STDERR) do
+        in_tmpdir do
+          example.run
+        end
+      end
     end
   end
 
-  it "creates gemspec" do
-    in_tmpdir do
-      expect{SchemaDev::Gem.build("NewGem")}.not_to raise_error
-      gemspec = File.read "new_gem/new_gem.gemspec"
-      expect(gemspec).to include %q{"schema_monkey", "~> 0.2", ">= 0.2.1"}
-      expect(gemspec).to match(/authors.*#{user_name}/)
-      expect(gemspec).to match(/email.*#{user_email}/)
-    end
-  end
+  Given(:user_name) { "My Name" }
+  Given(:user_email) { "my_name@example.com" }
 
-  context "complains" do
+  Given {
+    allow_any_instance_of(SchemaDev::Gem).to receive(:`).with("git config user.name").and_return user_name
+    allow_any_instance_of(SchemaDev::Gem).to receive(:`).with("git config user.email").and_return user_email
+  }
 
-    around(:each) do |example|
-      silence_stream(STDERR) do
-        example.run
+  context "builds" do
+
+    Given {
+      stub_request(:get, 'https://rubygems.org/api/v1/versions/schema_plus_core.json').to_return body: JSON.generate([
+        { number: "1.0.0.pre", prerelease: true},
+        { number: "0.2.1"},
+        { number: "0.1.2"},
+        { number: "0.1.1" },
+      ])
+    }
+
+    When { SchemaDev::Gem.build gem_name }
+
+    When(:gemspec) { File.read "#{gem_name}/#{gem_name}.gemspec" }
+
+    Invariant { expect(gemspec).to include %q{"schema_plus_core", "~> 0.2", ">= 0.2.1"} }
+    Invariant { expect(gemspec).to match %r{authors.*#{user_name}} }
+    Invariant { expect(gemspec).to match %r{email.*#{user_email}} }
+
+      context "flat gem" do
+        Given(:gem_name) { "new_gem" }
+        Then { expect(gemspec).to include %q{require 'new_gem/version'} }
+        Then { expect(File.read "new_gem/lib/new_gem.rb").to include %q{SchemaMonkey.register NewGem} }
       end
-    end
 
-    it "when no git user.name" do
-      in_tmpdir do
-        expect_any_instance_of(SchemaDev::Gem).to receive(:`).with("git config user.name").and_return ""
-        expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /who are you/i
+      context "subdir gem" do
+        Given(:gem_name) { "schema_plus_new_gem" }
+        Then { expect(gemspec).to include %q{require 'schema_plus/new_gem/version'} }
+        Then { expect(File.read "schema_plus_new_gem/lib/schema_plus_new_gem.rb").to include %q{require_relative 'schema_plus/new_gem.rb'} }
+        Then { expect(File.read "schema_plus_new_gem/lib/schema_plus/new_gem.rb").to include %q{SchemaMonkey.register SchemaPlus::NewGem} }
       end
+  end
+
+  context "complains" do
+
+    context "when no git user.name" do
+      Given(:user_name) { "" }
+      Then { expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /who are you/i }
     end
 
-    it "when in git worktree" do
-      in_tmpdir do
-        expect_any_instance_of(SchemaDev::Gem).to receive(:system).with(/^git rev-parse/).and_return true
-        expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /\bgit\b/
-      end
+    context "when in git worktree" do
+      Given { expect_any_instance_of(SchemaDev::Gem).to receive(:system).with(/^git rev-parse/).and_return true }
+      Then { expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /\bgit\b/ }
     end
 
-    it "when gem directory exists" do
-      in_tmpdir do
-        FileUtils.touch "new_gem"
-        expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /exists/
-      end
+    context "when gem directory exists" do
+      Given { FileUtils.touch "new_gem" }
+      Then { expect{SchemaDev::Gem.build("NewGem")}.to raise_error SystemExit, /exists/ }
     end
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'rspec/given'
 require 'tmpdir'
 require 'webmock/rspec'
 

data/templates/gem/GEM_NAME.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require '%GEM_NAME%/version'
+require '%GEM_LIB_PATH%/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "%GEM_NAME%"
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_monkey", %SCHEMA_MONKEY_DEPENDENCY%
+  gem.add_dependency "schema_plus_core", %SCHEMA_PLUS_CORE_DEPENDENCY%
 
   gem.add_development_dependency "bundler", "~> 1.7"
   gem.add_development_dependency "rake", "~> 10.0"

data/templates/gem/lib/GEM_BASE_NAME.rb

@@ -0,0 +1,13 @@
+require 'schema_plus/core'
+
+require_relative '%GEM_BASE_NAME%/version'
+
+# Load any mixins to ActiveRecord modules, such as:
+#
+#require_relative '%GEM_BASE_NAME%/active_record/base'
+
+# Load any middleware, such as:
+#
+# require_relative '%GEM_BASE_NAME%/middleware/model'
+
+SchemaMonkey.register %GEM_MODULE%

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-given
+  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
@@ -245,8 +259,8 @@ files:
 - templates/gem/README.md
 - templates/gem/Rakefile
 - templates/gem/gitignore
-- templates/gem/lib/GEM_NAME.rb
-- templates/gem/lib/GEM_NAME/version.rb
+- templates/gem/lib/GEM_BASE_NAME.rb
+- templates/gem/lib/GEM_BASE_NAME/version.rb
 - templates/gem/schema_dev.yml
 - templates/gem/spec/sanity_spec.rb
 - templates/gem/spec/spec_helper.rb

data/templates/gem/lib/GEM_NAME.rb

@@ -1,42 +0,0 @@
-require 'schema_monkey'
-
-require_relative '%GEM_NAME%/version'
-
-
-# Load any mixins to ActiveRecord modules, such as:
-#
-#   require_relative '%GEM_NAME%/active_record/base'
-#   require_relative '%GEM_NAME%/active_record/connection_adapters/abstract_adapter'
-#
-# Any modules named %GEM_MODULE%::ActiveRecord::<remainder-of-submodule-path>
-# will be automatically #include'd in their counterparts in ::ActiveRecord
-
-
-# Load any middleware, such as:
-#
-#   require_relative '%GEM_NAME%/middleware/model'
-#
-# Any modules named %GEM_MODULE%::Middleware::<submodule-path> will
-# automatically have their .insert method called.
-
-
-# Database adapter-specific mixin, if any, will automatically #include'd in
-# its counterpart depending on which database adapter is in use.
-module %GEM_MODULE%
-  module ActiveRecord
-    module ConnectionAdapters
-      # autoload :MysqlAdapter, 'schema_plus_tables/active_record/connection_adapters/mysql_adapter'
-      # autoload :PostgresqlAdapter, 'schema_plus_tables/active_record/connection_adapters/postgresql_adapter'
-      # autoload :Sqlite3Adapter, 'schema_plus_tables/active_record/connection_adapters/sqlite3_adapter'
-    end
-  end
-end
-
-
-# Extra load-time initialization can go here.  You can delete this if you don't have any.
-module %GEM_MODULE%
-  def self.insert
-  end
-end
-
-SchemaMonkey.register(%GEM_MODULE%)