switch_db 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec1149cc9d5c6d0bb34390a1503fe6048f780c17
-  data.tar.gz: b10f6db84a00e097292099b8e7aaf0fa8a5d0248
+  metadata.gz: 945496d9ebd771617bc253c3743cdbd675de078b
+  data.tar.gz: 97a4393635ea2f29830c01a11e3954481ec62b5f
 SHA512:
-  metadata.gz: 611341244196f13828eadd38516d203b65199993630f665fcbeccd8d113843c667ac6e55ee9d2d306c836fb9436f431299880f722001dbd933b2a53ca7561ca2
-  data.tar.gz: fe39838ca4125c47dca1bfed4171e24fb49e74922cd16ea8e47cd9de935dcae0c2742c45c31afb56a461c7baa7f13e269331c756ae6e25085d71eab00becc695
+  metadata.gz: a8724eb15a5e842589e44cb431ceb6ac17cdfeda8daf21f762be5c82cba18c07958f1390cc5429945767102c299c731c0fe27045c7430c5df33a578c996e98f4
+  data.tar.gz: cc25b516a169b16253fe869b83be28588cf45f59245a80a6db50ec68aad8f54105ca6fade2d43213bbec5806be3b958b44b5aaef495e40826cdcfff064d3ad17

data/.ruby-version

@@ -1 +1 @@
-2.3.5
+2.4.1

data/README.md

@@ -69,9 +69,6 @@ Restored database a 'application_test'
 
 # Set default username and password
 switch_db config user_name:root password:password
-
-# Remove config
-switch_db config user_name: password:
 ```
 
 ## Development

data/bin/switch_db

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'switch_db'

data/lib/switch_db/cli.rb

@@ -3,8 +3,9 @@ module SwitchDb
     class << self
       def run!(command, arguments = {})
         command_class = command_for(command)
-        reference_set = ReferenceSet.load_from_directory(SwitchDb.configuration.cache_dir)
+        reference_set = ReferenceSet.load_file(SwitchDb.configuration.reference_set_file_full_path)
         command_class.new(reference_set: reference_set).run(arguments)
+        reference_set.write_reference_set
       end
 
       private

data/lib/switch_db/command/restore.rb

@@ -13,16 +13,13 @@ module SwitchDb
 
         database = SwitchDb::Database.current_database
 
-        threads = reference.database_paths.map do |database_name, database_path|
-          Thread.new do
-            database.drop_database(database_name)
-            database.create_database(database_name)
-            database.import_database(database_name, database_path)
-            puts "Restored database a '#{database_name}'"
-          end
-        end
+        reference.database_paths.each do |database_name, database_path|
+          database.drop_database(database_name)
+          database.create_database(database_name)
+          database.import_database(database_name, database_path)
 
-        threads.each(&:join)
+          puts "Restored database a '#{database_name}'"
+        end
       end
     end
   end

data/lib/switch_db/command/store.rb

@@ -3,14 +3,14 @@ require 'fileutils'
 module SwitchDb
   module Command
     class Store < Base
-      def run(name:, database_names: [], force: false)
+      def run(name:, database_names: [])
         reference = SwitchDb::Reference.new(name: name, database_names: database_names)
         duplicated = @reference_set.references.key?(reference.name)
 
         FileUtils.mkdir_p(reference.full_path)
 
         reference.database_paths.each do |database_name, database_path|
-          next if !force && duplicated && !overwrite?(reference)
+          next if duplicated && !overwrite?(reference)
 
           SwitchDb::Database.current_database.dump_database(database_name, database_path)
           puts "Stored database a '#{database_name}'"

data/lib/switch_db/configuration.rb

@@ -5,11 +5,13 @@ module SwitchDb
   class Configuration
     attr_reader :config_file
     attr_reader :cache_dir
+    attr_accessor :reference_set_file
     attr_accessor :user_name
     attr_accessor :password
 
     def initialize
       @config_file = 'config.yml'
+      @reference_set_file = 'reference_set.yml'
       @cache_dir = Pathname.new(File.expand_path('~/.cache/switch_db'))
       @user_name = 'root'
       @password = nil
@@ -17,11 +19,16 @@ module SwitchDb
       load_from_config_file(configuration_full_path)
     end
 
+    def reference_set_file_full_path
+      cache_dir.join(reference_set_file)
+    end
+
     def to_h
       {
+        reference_set_file: reference_set_file,
         user_name: user_name,
         password: password
-      }.delete_if { |_, value| value.nil? || value.empty? }
+      }
     end
 
     def write_configuration_file
@@ -31,6 +38,7 @@ module SwitchDb
 
     def configuration_keys
       %i[
+        reference_set_file
         user_name
         password
       ]

data/lib/switch_db/option_parser.rb

@@ -79,8 +79,6 @@ module SwitchDb
       case option_name
       when 'database_names'
         @options[:database_names] = value.to_s.split(/(?:,|\s+)/)
-      when 'force'
-        @options[:force] = true
       when 'help'
         puts banner
         exit
@@ -103,7 +101,7 @@ module SwitchDb
             switch_db list
             switch_db config [key:value...]
             switch_db rm <name>
-            switch_db store <name> --database_names [database_name,database_name...] [--force]
+            switch_db store <name> --database_names [database_name,database_name...]
             switch_db restore <name>
 
           Examples:

data/lib/switch_db/reference_set.rb

@@ -1,35 +1,30 @@
 require 'fileutils'
-require 'pathname'
 require 'yaml'
 
 module SwitchDb
   class ReferenceSet
-    attr_reader :directory_path, :references
+    attr_reader :configuration_path, :references
 
-    def initialize(directory_path)
-      @directory_path = directory_path
+    def initialize(configuration_path)
+      @configuration_path = configuration_path
       @references = {}
     end
 
-    def self.load_from_directory(directory_path)
-      new(directory_path).tap do |instance|
-        directories = Dir[File.join(directory_path, '*')].select { |path| File.directory?(path) }
-
-        directories.each do |path|
-          reference_name = File.basename(path)
-          sql_file_paths = Dir[File.join(path, '*.sql')].select { |file_path| File.file?(file_path) }
-          database_names = sql_file_paths.map { |file_path| File.basename(file_path).gsub(/\.sql$/, '') }
+    def self.load_file(configuration_path)
+      new(configuration_path).tap do |instance|
+        yaml = YAML.load_file(configuration_path)
 
+        (yaml[:references] || []).map do |reference|
           reference = Reference.new(
-            name: reference_name,
-            database_names: database_names
+            name: reference[:name],
+            database_names: reference[:database_names]
           )
 
           instance.add_reference(reference)
         end
       end
     rescue Errno::ENOENT
-      new(directory_path)
+      new(configuration_path)
     end
 
     def add_reference(reference)
@@ -40,6 +35,11 @@ module SwitchDb
       @references.delete(reference.name)
     end
 
+    def write_reference_set
+      FileUtils.mkdir_p(configuration_directory)
+      File.write(@configuration_path, to_h.to_yaml)
+    end
+
     private
 
     def to_h
@@ -47,5 +47,9 @@ module SwitchDb
         references: references.values.map(&:to_h)
       }
     end
+
+    def configuration_directory
+      File.dirname(@configuration_path)
+    end
   end
 end

data/lib/switch_db/version.rb

@@ -1,3 +1,3 @@
 module SwitchDb
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switch_db
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - alpaca-tc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bin/switch_db
 - lib/switch_db.rb
 - lib/switch_db/cli.rb
@@ -114,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A command-line interface for a database dumpfile

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "switch_db"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here