squasher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8775b118d632b6d115055e0f8fcef4cfa9f0908c
-  data.tar.gz: c78d28c7863de87b9336487ebf6c60f9e7c5abab
+  metadata.gz: 2fd41e42699705d43fd3c54497abeb6ebce03d7b
+  data.tar.gz: 5a72b4c3fbee77a74f1d8ab93ea1a5c698521235
 SHA512:
-  metadata.gz: 4b6e4ca16a710cbc554f026c572cb18fdec3bbd605ca00bd288d15fa54cff6f4a32d6a7afba09f3209c1ba68a28cb60346c9ee1e5212d3f1a2b0afc6dd7620c0
-  data.tar.gz: 65f5605caa98b23b43796e6ccfeb0b4468b2830c6001923624ff9720f13e62622dfd8f9efd52191d856b681464dc280e14b1cf4eb2e650d967fc2f60cdfcbc6c
+  metadata.gz: 26552971b06f4989e83c5d76920f86d254ecb61c07f1b18974088b4a174181d1a7676ac551d28c4c603c495795c3109045deee89043a8de7b26e0854bd338b39
+  data.tar.gz: 896c9919f3a85f5dea662c92a6c0c26f5eb762243d89f0f56e8751179e9ebd433adcdd937b1f4f8d2ce1a546863ab1ce91297d610973197188e17cc2e11f93a4

data/README.md

@@ -39,7 +39,7 @@ You can tell `squasher` a more detailed date, for example:
 ## Requirements
 
 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 all the 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).
+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).
 
 ## Contributing
 

data/lib/squasher/config.rb

@@ -66,7 +66,8 @@ module Squasher
       return @dbconfig if defined?(@dbconfig)
       return @dbconfig = nil unless File.exists?(dbconfig_file)
 
-      @dbconfig = YAML.load_file(dbconfig_file)['development']
+      content = ERB.new(File.read(dbconfig_file)).result(binding)
+      @dbconfig = YAML.load(content)['development']
       if @dbconfig && !@dbconfig.empty?
         @dbconfig['database'] = 'squasher'
         @dbconfig = { 'development' => @dbconfig }

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/squasher/worker.rb

@@ -45,7 +45,7 @@ module Squasher
     def migrations
       return @migrations if @migrations
 
-      @migrations = config.migration_files.select { |file| before_date?(get_timestamp(file)) }
+      @migrations = config.migration_files.select { |file| before_date?(get_timestamp(file)) }.sort
     end
 
     def get_timestamp(file)

data/spec/fake_app/config/database.yml

@@ -1,5 +1,6 @@
 development:
   database: app_development
+  encoding: <%= "8-ftu".reverse %>
   user: root
   password: password
 test:

data/spec/lib/squasher/config_spec.rb

@@ -27,9 +27,9 @@ describe Squasher::Config do
     it 'add required db config file' do
       config.stub_dbconfig do
         File.open(File.join(fake_root, 'config', 'database.yml')) do |stream|
-          content = stream.read
-          expect(content).to include ("database: squasher")
-          expect(content).to include("development:")
+          content = YAML.load(stream.read)
+          expect(content["development"]["database"]).to eq("squasher")
+          expect(content["development"]["encoding"]).to eq("utf-8")
         end
       end
     end

data/squasher.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["mail@sergeyp.me"]
   spec.description   = %q{Squash your old migrations}
   spec.summary       = %q{Squash your old migrations}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/jalkoby/squasher"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sergey Pchelincev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ files:
 - spec/lib/squasher_spec.rb
 - spec/spec_helper.rb
 - squasher.gemspec
-homepage: ''
+homepage: https://github.com/jalkoby/squasher
 licenses:
 - MIT
 metadata: {}
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Squash your old migrations
@@ -127,4 +127,3 @@ test_files:
 - spec/lib/squasher/worker_spec.rb
 - spec/lib/squasher_spec.rb
 - spec/spec_helper.rb
-has_rdoc: