switch_db 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c9a1dc6785a1fe8b0783cee362b5a0fbd54844
-  data.tar.gz: 0e3c756f7e024416663442cfda3372f3e545576a
+  metadata.gz: ec1149cc9d5c6d0bb34390a1503fe6048f780c17
+  data.tar.gz: b10f6db84a00e097292099b8e7aaf0fa8a5d0248
 SHA512:
-  metadata.gz: fd6dc0c3c9161877d9ab267076bbf28f03012e121def85faf6073a1e613384406e5ad44fe607e7ba644dd0f4f9c5b438132cb52a4918fed44f035fa97a819274
-  data.tar.gz: 0d1c497e4d59e5452528ee5ec80266e9fca150efd4f5a3541d8ce751998a89ff6b69504f3f5047f268f0a64f6d03f08c1bb8e1050780c4d587cb2c06d8f82c4c
+  metadata.gz: 611341244196f13828eadd38516d203b65199993630f665fcbeccd8d113843c667ac6e55ee9d2d306c836fb9436f431299880f722001dbd933b2a53ca7561ca2
+  data.tar.gz: fe39838ca4125c47dca1bfed4171e24fb49e74922cd16ea8e47cd9de935dcae0c2742c45c31afb56a461c7baa7f13e269331c756ae6e25085d71eab00becc695

data/README.md

@@ -4,6 +4,14 @@ A command-line interface for a database dumpfile
 
 ## Installation
 
+### from rubygems
+
+```
+gem install switch_db
+```
+
+### from github
+
 ```sh
 git clone https://github.com/alpaca-tc/switch_db
 cd switch_db
@@ -61,6 +69,9 @@ 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/lib/switch_db/cli.rb

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

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: [])
+      def run(name:, database_names: [], force: false)
         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 duplicated && !overwrite?(reference)
+          next if !force && 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,13 +5,11 @@ 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
@@ -19,16 +17,11 @@ 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
@@ -38,7 +31,6 @@ module SwitchDb
 
     def configuration_keys
       %i[
-        reference_set_file
         user_name
         password
       ]

data/lib/switch_db/option_parser.rb

@@ -79,6 +79,8 @@ 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
@@ -101,7 +103,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...]
+            switch_db store <name> --database_names [database_name,database_name...] [--force]
             switch_db restore <name>
 
           Examples:

data/lib/switch_db/reference_set.rb

@@ -1,30 +1,35 @@
 require 'fileutils'
+require 'pathname'
 require 'yaml'
 
 module SwitchDb
   class ReferenceSet
-    attr_reader :configuration_path, :references
+    attr_reader :directory_path, :references
 
-    def initialize(configuration_path)
-      @configuration_path = configuration_path
+    def initialize(directory_path)
+      @directory_path = directory_path
       @references = {}
     end
 
-    def self.load_file(configuration_path)
-      new(configuration_path).tap do |instance|
-        yaml = YAML.load_file(configuration_path)
+    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$/, '') }
 
-        (yaml[:references] || []).map do |reference|
           reference = Reference.new(
-            name: reference[:name],
-            database_names: reference[:database_names]
+            name: reference_name,
+            database_names: database_names
           )
 
           instance.add_reference(reference)
         end
       end
     rescue Errno::ENOENT
-      new(configuration_path)
+      new(directory_path)
     end
 
     def add_reference(reference)
@@ -35,11 +40,6 @@ 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,9 +47,5 @@ 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.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switch_db
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - alpaca-tc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler