dbmanager 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.1.3
+
+* environments are now listed sorted
+* raise meaningful error when database.yml contains invalid data
+
+## v0.1.2
+
+* move checks for protected environment from adapters to dumpable and importable modules
+
 ## v0.1.0
 
 * major code refactoring

data/lib/dbmanager/dumpable.rb

@@ -13,7 +13,7 @@ module Dbmanager
     end
 
     def run
-      output.puts "\nPlease choose target file (defaults to #{default_filename}):\n\n"
+      output.print "\nPlease choose target file (defaults to #{default_filename}): "
       @filename = get_filename
       dumper.run
       output.puts "Database successfully dumped in #{filename} file."

data/lib/dbmanager/version.rb

@@ -1,3 +1,3 @@
 module Dbmanager
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/dbmanager/yml_parser.rb

@@ -5,7 +5,8 @@ require 'active_support/core_ext/hash'
 module Dbmanager
   module YmlParser
     extend self
-    attr_writer :config
+
+    class YmlInvalidError < StandardError; end
 
     def config
       @config ||= yml_load(db_config_file).deep_merge(override_config)
@@ -22,16 +23,25 @@ module Dbmanager
 
     def environments
       @environments ||= begin
-        config.select do |key, value|
-          value.has_key?('adapter')
-        end.each_with_object(ActiveSupport::OrderedHash.new) do |arr, hash|
-          hash[arr[0]] = Environment.new arr[1].merge(:name => arr[0])
+        yml_sorted_envs.each_with_object(ActiveSupport::OrderedHash.new) do |arr, hash|
+          env_name, env_config = arr[0], arr[1]
+          begin
+            hash[env_name] = Environment.new env_config.merge(:name => env_name)
+          rescue NoMethodError
+            raise YmlInvalidError, invalid_message(env_name, env_config)
+          end
         end
       end
     end
 
     private
 
+    def yml_sorted_envs
+      config.select do |key, value|
+        value.has_key?('adapter')
+      end.sort
+    end
+
     def yml_load(path)
       YAML.load(ERB.new(File.read(path)).result) || {}
     end
@@ -43,5 +53,10 @@ module Dbmanager
     def db_override_file
       File.join Dbmanager.rails_root, 'config', 'dbmanager_override.yml'
     end
+
+    def invalid_message(env_name, config)
+      message = "\"#{env_name}\" config seems to be corrupted:\n#{config.inspect}"
+      message << "\nPlease verify database.yml file (original error: #{$!.message})"
+    end
   end
 end

data/spec/lib/yml_parser_spec.rb

@@ -4,7 +4,7 @@ module Dbmanager
   describe YmlParser do
     before do
       stub_rails_root
-      YmlParser.config = nil
+      YmlParser.instance_eval { @config = nil }
     end
 
     describe '#config' do

metadata

@@ -1,74 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbmanager
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - andrea longhi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: helps manage db dumps and imports via rake tasks
-email: 
+email:
 - andrea.longhi@mikamai.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -100,40 +97,31 @@ files:
 - spec/lib/yml_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/std_stub.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dbmanager
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: database manager
-test_files: 
+test_files:
 - spec/fixtures/adapter_sample.rb
 - spec/fixtures/config/database.yml
 - spec/fixtures/config/dbmanager_override.yml