ridgepole 0.6.5 → 0.6.6.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0b8970049df58ea142eb1bc723846cb5099eb5b
-  data.tar.gz: 886ba18f1c6b97e60756241ec8d4d6bc7e2e5c94
+  metadata.gz: 43b2e1e6fe82bc1adaecdf2e03682a3bd1756e2d
+  data.tar.gz: 30ca92eea9cd6296e88293671a04d2511a4b3141
 SHA512:
-  metadata.gz: 9806a409967575629a43d02b7cf9bf1ee42345a89fd7d004ab41b9c853bbc340434e5c4aa8b92db6ed707a5f26c612d3cda8c1d63ecb937ff6f1b612b1a1e110
-  data.tar.gz: d2491149f7e4d0f73747832c65e7b69b77232f6f6995a5845b90146e98fc94d5d058013242c2598282b12ba3d5cb3ccf2ccaac3741fe8cafe442808a0d08e557
+  metadata.gz: 6eef1346bb2cbd9884ebe22728fbb22456e393fb2fdc39b44d274f6bad03d5bffed364131216fa37500e2498ce87760786adb6e4e1141b288fe0e9327d5f9936
+  data.tar.gz: 073a3053fd3a2a2932d34cb03fc7122f13a283d50d7e73bca56c0bea03b7035f6d494d62d6724d1224163eadbfa53faa84c94357a428b1d6129517cea135b55e

data/.travis.yml

@@ -5,8 +5,9 @@ cache:
   - bundler
   - apt
 rvm:
-  - 2.2.5
-  - 2.3.3
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 before_install:
   - gem install bundler
 before_script:

data/README.md

@@ -13,7 +13,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 Please don't use the following nameless fk:
 
-```ruby 
+```ruby
 add_foreign_key :articles, :authors # without `name:`
 ```
 
@@ -69,6 +69,10 @@ add_foreign_key :articles, :authors # without `name:`
   * Support DDL Comment (Rails5 only)
   * Output schema diff when pass `--verbose`
   * Support composite primary key (Rails5 only / [pull#97](https://github.com/winebarrel/ridgepole/pull/97))
+* `>= 0.6.6`
+  * Use `t.column` for migration ([pull#114](https://github.com/winebarrel/ridgepole/pull/114))
+  * Support DATABASE_URL format ([pull#118](https://github.com/winebarrel/ridgepole/pull/118))
+  * Add Ruby2.4 CI ([pull#119](https://github.com/winebarrel/ridgepole/pull/119))
 
 ## Installation
 
@@ -138,7 +142,9 @@ encoding: utf8
 database: blog
 username: root
 
-$ ridgepole -c config.yml --export -o Schemafile # or `ridgepole -c '{adapter: mysql2, database: blog}' ...`
+$ ridgepole -c config.yml --export -o Schemafile
+# or `ridgepole -c '{adapter: mysql2, database: blog}' ...`
+# or `ridgepole -c 'mysql2://root:3306@127.0.0.1/blog' ...`
 Export Schema to `Schemafile`
 
 $ cat Schemafile

data/gemfiles/activerecord_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", ">= 5.0.0"
+gem "activerecord", "~> 5.0.0"
 
 gemspec :path => "../"

data/lib/ridgepole/cli/config.rb

@@ -4,15 +4,16 @@ require 'yaml'
 class Ridgepole::Config
   class << self
     def load(config, env = 'development')
-      parsed_config = if File.exist?(config)
-                        parse_config_file(config)
-                      else
-                        YAML.load(ERB.new(config).result)
-                      end
+      if File.exist?(config)
+        parsed_config = parse_config_file(config)
+      elsif (expanded = File.expand_path(config)) and File.exist?(expanded)
+        parsed_config = parse_config_file(expanded)
+      else
+        parsed_config = YAML.load(ERB.new(config).result)
+      end
 
       unless parsed_config.kind_of?(Hash)
-        config = File.expand_path(config)
-        parse_config = parse_config_file(config)
+        parsed_config = parse_database_url(config)
       end
 
       if parsed_config.has_key?(env.to_s)
@@ -28,5 +29,21 @@ class Ridgepole::Config
       yaml = ERB.new(File.read(path)).result
       YAML.load(yaml)
     end
-  end # of class methods
+
+    def parse_database_url(config)
+      uri = URI.parse(config)
+
+      if [uri.scheme, uri.user, uri.password, uri.host, uri.path].any? {|i| i.nil? }
+        raise "Invalid config: #{config.inspect}"
+      end
+
+      {
+        'adapter'  => uri.scheme,
+        'username' => uri.user,
+        'password' => uri.password,
+        'host'     => uri.host,
+        'database' => uri.path.sub(%r|\A/|, ''),
+      }
+     end
+   end # of class methods
 end

data/lib/ridgepole/delta.rb

@@ -227,7 +227,7 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
       normalize_limit(column_type, column_options)
 
       buf.puts(<<-EOS)
-  t.#{column_type}(#{column_name.inspect}, #{inspect_options_include_default_proc(column_options)})
+  t.column(#{column_name.inspect}, :#{column_type.to_s.inspect}, #{inspect_options_include_default_proc(column_options)})
       EOS
     end
 

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5'
+  VERSION = '0.6.6.beta'
 end

data/spec/mysql/cli/config_spec.rb

@@ -71,6 +71,29 @@ describe Ridgepole::Config do
     end
   end
 
+  context 'when passed yaml file' do
+    let(:config) {
+      <<-YAML.strip_heredoc
+        adapter: mysql2
+        encoding: utf8
+        database: blog
+        username: root
+      YAML
+    }
+    let(:env) { 'development' }
+    it {
+      Tempfile.create("database.yml") do |f|
+        f.puts config
+        f.flush
+
+        expect(subject['adapter']).to eq "mysql2"
+        expect(subject['encoding']).to eq "utf8"
+        expect(subject['database']).to eq "blog"
+        expect(subject['username']).to eq "root"
+      end
+    }
+  end
+
   context 'when passed unexisting yaml' do
     let(:config) {
       'database.yml'
@@ -81,7 +104,19 @@ describe Ridgepole::Config do
     it {
       expect {
         subject
-      }.to raise_error Errno::ENOENT
+      }.to raise_error 'Invalid config: "database.yml"'
+    }
+  end
+
+  context 'when passed DATABASE_URL' do
+    let(:config) { 'mysql2://root:1234@127.0.0.1/blog' }
+    let(:env) { 'development' }
+
+    it {
+      expect(subject['adapter']).to eq "mysql2"
+      expect(subject['database']).to eq "blog"
+      expect(subject['username']).to eq "root"
+      expect(subject['password']).to eq "1234"
     }
   end
 end

data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb

@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
       expect(delta.script).to match_fuzzy <<-EOS
         create_table("employee_clubs", {:options=>"ENGINE=MyISAM CHARSET=utf8"}) do |t|
-          t.integer("emp_no", {:null=>false, :unsigned=>true, :limit=>4})
-          t.integer("club_id", {:null=>false, :unsigned=>true, :limit=>4})
+          t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
+          t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
         end
         add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
       EOS

data/spec/mysql/migrate/migrate_drop_table_spec.rb

@@ -135,22 +135,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy erbh(<<-EOS)
         create_table("clubs", <%= unsigned(true) %>) do |t|
-          t.string("name", <%= limit(255) >> {default: "", null: false, limit: 255} %>)
+          t.column("name", :"string", <%= limit(255) >> {default: "", null: false, limit: 255} %>)
         end
         add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
 
         create_table("employee_clubs", <%= unsigned(true) %>) do |t|
-          t.integer("emp_no", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
-          t.integer("club_id", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
+          t.column("emp_no", :"integer", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
+          t.column("club_id", :"integer", <%= limit(4) >> {null: false, limit: 4} + unsigned(true) %>)
         end
         add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
 
         create_table("employees", <%= {primary_key: "emp_no"} + unsigned(true) %>) do |t|
-          t.date("birth_date", {:null=>false})
-          t.string("first_name", {:limit=>14, :null=>false})
-          t.string("last_name", {:limit=>16, :null=>false})
-          t.string("gender", {:limit=>1, :null=>false})
-          t.date("hire_date", {:null=>false})
+          t.column("birth_date", :"date", {:null=>false})
+          t.column("first_name", :"string", {:limit=>14, :null=>false})
+          t.column("last_name", :"string", {:limit=>16, :null=>false})
+          t.column("gender", :"string", {:limit=>1, :null=>false})
+          t.column("hire_date", :"date", {:null=>false})
         end
       EOS
     }

data/spec/postgresql/migrate/migrate_drop_table_spec.rb

@@ -134,21 +134,21 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         create_table("clubs", {}) do |t|
-          t.string("name", {:limit=>255, :default=>"", :null=>false})
+          t.column("name", :"string", {:limit=>255, :default=>"", :null=>false})
         end
         add_index("clubs", ["name"], {:name=>"idx_name", :unique=>true, :using=>:btree})
 
         create_table("employee_clubs", {}) do |t|
-          t.integer("emp_no", {:null=>false})
-          t.integer("club_id", {:null=>false})
+          t.column("emp_no", :"integer", {:null=>false})
+          t.column("club_id", :"integer", {:null=>false})
         end
         add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_employee_clubs_emp_no_club_id", :using=>:btree})
 
         create_table("employees", {:primary_key=>"emp_no"}) do |t|
-          t.date("birth_date", {:null=>false})
-          t.string("first_name", {:limit=>14, :null=>false})
-          t.string("last_name", {:limit=>16, :null=>false})
-          t.date("hire_date", {:null=>false})
+          t.column("birth_date", :"date", {:null=>false})
+          t.column("first_name", :"string", {:limit=>14, :null=>false})
+          t.column("last_name", :"string", {:limit=>16, :null=>false})
+          t.column("hire_date", :"date", {:null=>false})
         end
       EOS
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -360,12 +360,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.