branchinator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cf45cc27acc050d49ebd0664f226c6c173d071
-  data.tar.gz: 9bb2f0d872cdb384a209a7211214669ee19ba7e5
+  metadata.gz: d7648ccf5809f8cdbf1c17e37b65677302e67ad5
+  data.tar.gz: 6131d88c0aa0492cbb2be7e1e5374fcb0b5788b7
 SHA512:
-  metadata.gz: 68d4bea6aeef2e4fa2add8bc657e005f96e2aec5bee3bd157baa93b154a0edbfbaf7911db31071f6fbb78cc71b39ce127717bbd27a1f6fe40eb32bc2bffc0790
-  data.tar.gz: 78b99b7bdf77abb06020234762d0268e3d775983ecc412bb890a88eaa3753dc6c973f0c25c96318d1c5a11e4616a3aba82f5d64e7846991f1a9656fe7022d4e5
+  metadata.gz: fc4fa837ff16507789ca59ec06dee92331bdf845f2722f8ad7c5e2b0bc0115926b5515944daeec9fa495f01f61bbfb0d6779c0807182a04e2a00afe2d926b990
+  data.tar.gz: 76402967595dae0cfb1de69ab7fb82258eb523a896e414ed796d0ab04842ca45f191dafe7e3e9342ed7b6ed3f8fd8cac22b9b0c2cabc10b44908afdc79cc4d66

data/README.md

@@ -1,8 +1,12 @@
 Branchinator
 ============
 
+[![Gem Version](https://badge.fury.io/rb/branchinator.svg)](https://badge.fury.io/rb/branchinator)
+
 Database per branch so you can easily switch between database models.
 
+Works with Rails 4.x and 5.x
+
 # How to use
 
 `bin/rails db:branch`
@@ -23,7 +27,7 @@ Put it into:
 
 ```ruby
 group :development, :test do
-  gem 'branchinator', github: 'pawelniewie/branchinator'
+  gem 'branchinator'
 end
 ```
 
@@ -39,3 +43,22 @@ test:
   database: <%= Branchinator.database %>
 ```
 
+Update your `.gitingore` as well:
+
+```echo .branchinator >> .gitignore```
+
+# Additional configuration
+
+By default database name is taken from application name and looks something like:
+
+`awesomeproject_branch_environment`
+
+If you want you can change the first part and the separator.
+
+In your `database.yml` put:
+
+```yaml
+branchinator:
+  prefix: awesome-project
+  separator: _
+```

data/lib/branchinator/branched_database.rb

@@ -11,7 +11,7 @@ module Branchinator
     end
 
     def current_branch
-      `git branch | grep "*"`.chomp.split.last.parameterize
+      `git branch | grep "*"`.chomp.split.last.gsub(/.*\//, '').parameterize
     end
 
     def branch_database

data/lib/branchinator/version.rb

@@ -1,3 +1,3 @@
 module Branchinator
-  VERSION = '0.1.0'
-end
+  VERSION = '0.2.0'
+end

data/lib/tasks/db.rb

@@ -2,8 +2,11 @@ require 'branchinator/branched_database'
 require 'branchinator/constants'
 
 def create_database(env)
+  branchinator = ActiveRecord::Base.configurations.values_at('branchinator').first || {}
+  branchinator.deep_symbolize_keys!
+
   config = ActiveRecord::Base.configurations.values_at(env.to_s).first
-  config['database'] = Branchinator::BranchedDatabase.name(env: env)
+  config['database'] = Branchinator::BranchedDatabase.name(branchinator.merge(env: env))
 
   ActiveRecord::Tasks::DatabaseTasks.create(config)
   ActiveRecord::Base.establish_connection(env)
@@ -11,7 +14,13 @@ def create_database(env)
   if env == :test
     ActiveRecord::Schema.verbose = false
   end
-  ActiveRecord::Tasks::DatabaseTasks.load_schema(config)
+
+  if Rails.version.start_with? '4'
+    ActiveRecord::Tasks::DatabaseTasks.load_schema_for(config)
+  else
+    ActiveRecord::Tasks::DatabaseTasks.load_schema(config)
+  end
+
   ActiveRecord::Tasks::DatabaseTasks.load_seed
 
   config['database']
@@ -38,4 +47,4 @@ namespace :db do
     desc 'Remove then Create the branch specific database'
     task :reset => [:remove, :branch]
   end
-end
+end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: branchinator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pawel Niewiadomski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails helper that simplifies database per branch development.
@@ -31,13 +45,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/branchinator.rb
 - lib/branchinator/branched_database.rb
 - lib/branchinator/constants.rb
 - lib/branchinator/railtie.rb
 - lib/branchinator/version.rb
+- lib/branchinator.rb
 - lib/tasks/db.rb
-homepage: https://pawelniewiadomski.com
+homepage: https://github.com/pawelniewie/branchinator
 licenses:
 - MIT
 metadata: {}
@@ -47,17 +61,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Helps you manage database per branch