brancher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fd309a1776a81932593b18de4367bfb11a404d
-  data.tar.gz: 093984983555acb5bbfdb75965f30764430721ab
+  metadata.gz: 338f02687959d178804d912e5b7055f2e764a644
+  data.tar.gz: 85e3e43519492a9614418763f0be94c890bdd524
 SHA512:
-  metadata.gz: 1902a3cfcfe2aaf6581df862b116f59d93c1a30ef1b71f2a8d8a407c6ec3c95397078d9784730cdebe03715170c64e75ce9bd1cab46149e93541983343e8203a
-  data.tar.gz: b98ddad42f34d988fee4f6748eee83bf0aab86d8f4ba098cdbbecf2f4888d8aeb70bed0f44e0aca90871ec5850d4e7b5757dc18cdb2bd8de324d4b358fd0c18e
+  metadata.gz: d241ee0923aca862c6ef840cdaced23daa31ac6c758cc0e9a2295901b4cae4c5d4947f5f019c98507f527c4119177a54a91c56cb319b891623bb56d5dba1e989
+  data.tar.gz: 49fc4fd0579356f4b7c844f617355104270949b26e1830cbe5284e5fd92d091a7b94dc4b108f5b8bc9586645747f8b98ce665344fe41ac29a06a7330a0c83c9a

data/README.md

@@ -1,6 +1,10 @@
 # Brancher
 
-A rubygem to switch databases connected with ActiveRecord by Git branch
+[![Build Status](https://travis-ci.org/naoty/brancher.svg)](https://travis-ci.org/naoty/brancher)
+
+Brancher is a rubygem to switch databases connected with ActiveRecord by Git branch.
+
+For example, if the name of a database is `sample_app_dev`, Brancher will switch the database to `sample_app_dev_master` at `master` branch, and `sample_app_dev_some_feature` at `some_feature` branch.
 
 ## Installation
 
@@ -18,10 +22,6 @@ And then execute:
 $ bundle
 ```
 
-## Usage
-
-For example, if the name of a database is `sample_app_dev`, Brancher will switch the database to `sample_app_dev_master` at `master` branch, and `sample_app_dev_some_feature` at `some_feature` branch.
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/brancher/fork )
@@ -32,4 +32,4 @@ For example, if the name of a database is `sample_app_dev`, Brancher will switch
 
 ## Author
 
-[naoty](https://github.com/naoty)
+[naoty](https://github.com/naoty)

data/brancher.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord"
-  spec.add_dependency "activesupport"
   spec.add_dependency "railties"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/brancher/database_rename_service.rb

@@ -8,9 +8,9 @@ module Brancher
       configuration = configurations[env]
       database_extname = File.extname(configuration["database"])
       database_name = configuration["database"].gsub(%r{#{database_extname}$}) { "" }
-      database_name += "_#{current_branch}"
+      database_name += suffix unless database_name =~ %r{#{suffix}$}
       configuration["database"] = database_name + database_extname
-      configurations.merge!(env => configuration)
+      configurations
     end
 
     private
@@ -19,6 +19,10 @@ module Brancher
       Rails.env
     end
 
+    def suffix
+      "_#{current_branch}"
+    end
+
     def current_branch
       @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
     end

data/lib/brancher/version.rb

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

data/spec/brancher/database_rename_service_spec.rb

@@ -3,8 +3,10 @@ require "spec_helper"
 describe Brancher::DatabaseRenameService do
   describe ".rename" do
     before do
-      allow(Brancher::DatabaseRenameService).to receive(:current_branch)
-        .and_return(branch)
+      allow(Brancher::DatabaseRenameService).to receive_messages(
+        current_branch: branch,
+        env: env
+      )
     end
 
     let(:configurations) do
@@ -39,8 +41,14 @@ describe Brancher::DatabaseRenameService do
     end
 
     let(:new_configurations) do
-      configurations[env]["database"] = new_database_name
-      configurations
+      {
+        env => {
+          "adapter" => adapter,
+          "pool" => 5,
+          "timeout" => 5000,
+          "database" => new_database_name
+        }
+      }
     end
 
     subject do
@@ -64,5 +72,13 @@ describe Brancher::DatabaseRenameService do
 
       it { is_expected.to eq new_configurations }
     end
+
+    context "when a database has already renamed" do
+      let(:database_name) do
+        "db/sample_app_development_#{branch}.sqlite3"
+      end
+
+      it { is_expected.to eq new_configurations }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brancher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Naoto Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement