brancher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794bc618c2113fb24eaf33499b55323ebc7425f6
-  data.tar.gz: 9eb12e1cef212d3d532b35829bd4114f7f4b1611
+  metadata.gz: e5fd309a1776a81932593b18de4367bfb11a404d
+  data.tar.gz: 093984983555acb5bbfdb75965f30764430721ab
 SHA512:
-  metadata.gz: 3b00f8e1c87e437aece432eecf274846293a5c5b70ed04702737a8bae8ff8b8049230cf8fac657acfa78254672109e33d6b7f0b92c6177c90c7b9bdc6bb077a3
-  data.tar.gz: 901c925cfabb113446def2523c338a0daf78c2a272dc4881aff76777d72c5e3dd78e09174c943bb03680a276db4fbbb1e84b712ec87d97ed66516ec28b9bb646
+  metadata.gz: 1902a3cfcfe2aaf6581df862b116f59d93c1a30ef1b71f2a8d8a407c6ec3c95397078d9784730cdebe03715170c64e75ce9bd1cab46149e93541983343e8203a
+  data.tar.gz: b98ddad42f34d988fee4f6748eee83bf0aab86d8f4ba098cdbbecf2f4888d8aeb70bed0f44e0aca90871ec5850d4e7b5757dc18cdb2bd8de324d4b358fd0c18e

data/brancher.gemspec

@@ -18,9 +18,11 @@ 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"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

data/lib/brancher.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(__dir__) unless $LOAD_PATH.include?(__dir__)
 
-require "brancher/database_tasks"
+require "brancher/database_configuration_renaming"
+require "brancher/database_rename_service"
 require "brancher/railtie"
 require "brancher/version"

data/lib/brancher/database_configuration_renaming.rb

@@ -0,0 +1,9 @@
+module Brancher
+  module DatabaseConfigurationRenaming
+    def database_configuration
+      configurations = super
+      DatabaseRenameService.rename!(configurations)
+      configurations
+    end
+  end
+end

data/lib/brancher/database_rename_service.rb

@@ -0,0 +1,26 @@
+require "active_record"
+
+module Brancher
+  module DatabaseRenameService
+    extend self
+
+    def rename!(configurations)
+      configuration = configurations[env]
+      database_extname = File.extname(configuration["database"])
+      database_name = configuration["database"].gsub(%r{#{database_extname}$}) { "" }
+      database_name += "_#{current_branch}"
+      configuration["database"] = database_name + database_extname
+      configurations.merge!(env => configuration)
+    end
+
+    private
+
+    def env
+      Rails.env
+    end
+
+    def current_branch
+      @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
+    end
+  end
+end

data/lib/brancher/railtie.rb

@@ -2,11 +2,14 @@ require "rails"
 
 module Brancher
   class Railtie < Rails::Railtie
+    initializer "brancher.rename_database", before: "active_record.initialize_database" do
+      Rails::Application::Configuration.send(:prepend, DatabaseConfigurationRenaming)
+    end
+
     rake_tasks do
       namespace :db do
         task :load_config do
-          current_branch_name = `git rev-parse --abbrev-ref HEAD`.chomp
-          DatabaseTasks.rename_database(current_branch_name)
+          DatabaseRenameService.rename!(ActiveRecord::Base.configurations)
         end
       end
     end

data/lib/brancher/version.rb

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

data/spec/brancher/database_rename_service_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+describe Brancher::DatabaseRenameService do
+  describe ".rename" do
+    before do
+      allow(Brancher::DatabaseRenameService).to receive(:current_branch)
+        .and_return(branch)
+    end
+
+    let(:configurations) do
+      {
+        env => {
+          "adapter" => adapter,
+          "pool" => 5,
+          "timeout" => 5000,
+          "database" => database_name
+        }
+      }
+    end
+
+    let(:adapter) do
+      "sqlite3"
+    end
+
+    let(:database_name) do
+      "db/sample_app_development.sqlite3"
+    end
+
+    let(:env) do
+      "development"
+    end
+
+    let(:branch) do
+      "master"
+    end
+
+    let(:new_database_name) do
+      "db/sample_app_development_#{branch}.sqlite3"
+    end
+
+    let(:new_configurations) do
+      configurations[env]["database"] = new_database_name
+      configurations
+    end
+
+    subject do
+      Brancher::DatabaseRenameService.rename!(configurations)
+    end
+
+    it { is_expected.to eq new_configurations }
+
+    context "when the adapter is mysql2" do
+      let(:adapter) do
+        "mysql2"
+      end
+
+      let(:database_name) do
+        "sample_app_development"
+      end
+
+      let(:new_database_name) do
+        "#{database_name}_#{branch}"
+      end
+
+      it { is_expected.to eq new_configurations }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brancher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naoto Kaneko
@@ -24,6 +24,20 @@ 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
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: 
 email:
 - naoty.k@gmail.com
@@ -95,10 +123,11 @@ files:
 - Rakefile
 - brancher.gemspec
 - lib/brancher.rb
-- lib/brancher/database_tasks.rb
+- lib/brancher/database_configuration_renaming.rb
+- lib/brancher/database_rename_service.rb
 - lib/brancher/railtie.rb
 - lib/brancher/version.rb
-- spec/brancher/database_tasks_spec.rb
+- spec/brancher/database_rename_service_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/naoty/brancher
 licenses:
@@ -125,5 +154,5 @@ signing_key:
 specification_version: 4
 summary: Switching databases connected with ActiveRecord by Git branch
 test_files:
-- spec/brancher/database_tasks_spec.rb
+- spec/brancher/database_rename_service_spec.rb
 - spec/spec_helper.rb

data/lib/brancher/database_tasks.rb

@@ -1,20 +0,0 @@
-require "active_record"
-
-module Brancher
-  module DatabaseTasks
-    extend self
-
-    def rename_database(branch_name)
-      database_extname = File.extname(current_configuration["database"])
-      database_name = current_configuration["database"].gsub(%r{#{database_extname}$}) { "" }
-      database_name += "_#{branch_name}"
-      current_configuration["database"] = database_name + database_extname
-    end
-
-    private
-
-    def current_configuration
-      ActiveRecord::Base.configurations[Rails.env]
-    end
-  end
-end

data/spec/brancher/database_tasks_spec.rb

@@ -1,57 +0,0 @@
-require "spec_helper"
-
-describe Brancher::DatabaseTasks do
-  describe ".rename_database" do
-    before do
-      allow(Brancher::DatabaseTasks).to receive(:current_configuration)
-        .and_return(configuration)
-    end
-
-    let(:configuration) do
-      {
-        adapter: adapter,
-        pool: 5,
-        timeout: 5000,
-        database: database_name
-      }
-    end
-
-    let(:adapter) do
-      "sqlite3"
-    end
-
-    let(:database_name) do
-      "db/sample_app_development.sqlite3"
-    end
-
-    let(:branch) do
-      "master"
-    end
-
-    let(:new_database_name) do
-      "db/sample_app_development_#{branch}.sqlite3"
-    end
-
-    subject do
-      Brancher::DatabaseTasks.rename_database(branch)
-    end
-
-    it { is_expected.to eq new_database_name }
-
-    context "when the adapter is mysql2" do
-      let(:adapter) do
-        "mysql2"
-      end
-
-      let(:database_name) do
-        "sample_app_development"
-      end
-
-      let(:new_database_name) do
-        "#{database_name}_#{branch}"
-      end
-
-      it { is_expected.to eq new_database_name }
-    end
-  end
-end