squasher 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0778a1404502d52c05ea708ff823f10b2b8a832
-  data.tar.gz: 2f22c623c7b578290366930e5c325ebc1f28506e
+  metadata.gz: b2fce68be416351e406504bff0a9e0e8b973e3c6
+  data.tar.gz: 078725cc2be6f257b3b2b6523223875d4478abb2
 SHA512:
-  metadata.gz: 502c4b9e2b6545473aa2804fda03f5d0a00f90952c11600b8c109057ed08e19a909b649a93563609bc97fd5391ce6baf6d5642a2da371d0d67c3d4e4cacfefa6
-  data.tar.gz: 1cec4959ad6c7ac08b52fcb8be657efc0f857ab772f6e81653b58ecbd3a1e21fb935d6feea0079e71fad001ecbdbe1ac093e1f21fa07eebed5c88a29d4cbda50
+  metadata.gz: e62d6daf9a6b5fbc60cb9627b6eb1645db98c937fa9c0a898158828f42822dd6e3b38d8640a1e929ab6e77aab0afc22ce01632368ec8a22960153ee51598ed81
+  data.tar.gz: 3443e9e4ae4061224c4a4d4a8d8e1605c398d0f73aaae56e3d2269a859c5acaf96df7167af2c00f83c2854a8cd5adfeec5746a878986adbbd14218af854b17e1

data/.travis.yml

@@ -1,3 +1,5 @@
+before_install:
+  - gem update bundler
 language: ruby
 rvm:
   - 2.1.0

data/README.md

@@ -41,6 +41,10 @@ You can tell `squasher` a more detailed date, for example:
 It works and was tested on Ruby 1.9.3+ and Rails 3.1+. It also requires a valid configuration in `config/database.yml` and using Ruby format in `db/schema.rb` (default Rails use-case).
 If an old migration inserted data (created ActiveRecord model records) you will lose this code in the squashed migration, **BUT** `squasher` will ask you to leave a tmp database which will have all data that was inserted while migrating. Using this database you could add that data as another migration, or into `config/seed.rb` (the expected place for this stuff).
 
+## Changelog
+- 0.1.6
+    - support multiple database settings ([@ppworks](https://github.com/ppworks))
+
 ## Contributing
 
 1. Fork it

data/lib/squasher.rb

@@ -18,7 +18,7 @@ module Squasher
 
   def rake(command, description = nil)
     tell(description) if description
-    system("bundle exec rake #{ command }")
+    system("bundle exec rake #{ command } 2>/dev/null")
   end
 
   def ask(*args)

data/lib/squasher/config.rb

@@ -68,18 +68,14 @@ module Squasher
       return @dbconfig = nil unless File.exists?(dbconfig_file)
 
       begin
-        content = ERB.new(File.read(dbconfig_file)).result(binding)
-        @dbconfig = YAML.load(content)['development']
+        content = File.read(dbconfig_file).gsub(/database: (.+)/, 'database: squasher')
+        parsed_content = ERB.new(content).result(binding)
+        @dbconfig = YAML.load(parsed_content)
+        @dbconfig = nil unless @dbconfig.keys.include?('development')
       rescue
         @dbconfig = nil
       end
-
-      if @dbconfig && !@dbconfig.empty?
-        @dbconfig['database'] = 'squasher'
-        @dbconfig = { 'development' => @dbconfig }
-      else
-        @dbconfig = nil
-      end
+      @dbconfig
     end
 
     def update_dbconfig_file

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/fake_app/config/database.yml

@@ -7,3 +7,12 @@ test:
   database: app_test
   user: root
   password: password
+another_development:
+  database: another_development
+  encoding: <%= "8-ftu".reverse %>
+  user: root
+  password: password
+another_test:
+  database: another_test
+  user: root
+  password: password

data/spec/lib/squasher/config_spec.rb

@@ -30,6 +30,8 @@ describe Squasher::Config do
           content = YAML.load(stream.read)
           expect(content["development"]["database"]).to eq("squasher")
           expect(content["development"]["encoding"]).to eq("utf-8")
+          expect(content["another_development"]["database"]).to eq("squasher")
+          expect(content["another_development"]["encoding"]).to eq("utf-8")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sergey Pchelincev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler