ridgepole 0.5.3.beta → 0.5.3.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f3221edd3f0db3334b481616217bc488b28cb4
-  data.tar.gz: fa689ed8f59a113eb1541de008812b441e191ae5
+  metadata.gz: 7eb2da59b698d8028a88d187e3bdb51d9a2e1947
+  data.tar.gz: a9f3355b8dac1b03970dfa414d53936813507b0c
 SHA512:
-  metadata.gz: 9c6925b000bb61e97563d33f434e6c14905abbdf51262e61e1e3eaddcb5e9f18b76683a799c8e487ee185f02ce49e306926f66cfc6a83db327e86d936bad6f54
-  data.tar.gz: 3e3c2b1a5e0a034842e7cda882c55b90773e89910a489c7077558df4e050063622b808b6c6c0e253cfdb4d8feb65a1c0fa5e5cf72dbd89e0b438bafb812bd4e2
+  metadata.gz: 73eacc99ba04fd98a0feaf3b648b15dd36ab526792fea0bdada1b1eed7a6406b1adf46e97bdadbfcae159ff2d80ffe45da72b3d37b2b05da198ca1db836ed50e
+  data.tar.gz: d14691d0c2ed17afb698eaa0d5f746316f6d8145ae6c2a65cfda27c440feededc625890af10bc837fdee89568030f11f3635f9c05d7b25395d05031929ccd364

data/lib/ridgepole/cli/config.rb

@@ -2,18 +2,31 @@ require 'erb'
 require 'yaml'
 
 class Ridgepole::Config
-  def self.load(config, env = 'development')
-    config = if File.exist?(config)
-               yaml = ERB.new(File.read(config)).result
-               YAML.load(yaml)
-             else
-               YAML.load(ERB.new(config).result)
-             end
+  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 config.has_key?(env.to_s)
-      config.fetch(env.to_s)
-    else
-      config
+      unless parsed_config.kind_of?(Hash)
+        config = File.expand_path(config)
+        parse_config = parse_config_file(config)
+      end
+
+      if parsed_config.has_key?(env.to_s)
+        parsed_config.fetch(env.to_s)
+      else
+        parsed_config
+      end
+    end
+
+    private
+
+    def parse_config_file(path)
+      yaml = ERB.new(File.read(path)).result
+      YAML.load(yaml)
     end
-  end
+  end # of class methods
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.5.3.beta'
+  VERSION = '0.5.3.beta2'
 end

data/ridgepole.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'foreigner', '<= 1.7.1'
   spec.add_development_dependency 'activerecord-mysql-pkdump', '>= 0.1.0'
   spec.add_development_dependency 'migration_comments'
-  spec.add_development_dependency 'activerecord-mysql-awesome', '>= 0.0.3'
+  spec.add_development_dependency 'activerecord-mysql-awesome', '<= 0.0.4'
 end

data/spec/cli/config_spec.rb

@@ -70,4 +70,18 @@ describe Ridgepole::Config do
       }
     end
   end
+
+  context 'when passed unexisting yaml' do
+    let(:config) {
+      'database.yml'
+    }
+
+    let(:env) { 'development' }
+
+    it {
+      expect {
+        subject
+      }.to raise_error(%r|o such file or directory - .*/database.yml|)
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.3.beta
+  version: 0.5.3.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -168,16 +168,16 @@ dependencies:
   name: activerecord-mysql-awesome
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email: