db-clone 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b5b95c07deaed846e15c2316eda7101833acdfb
-  data.tar.gz: 512399b9b7471805f42e0f4d819363334ad67091
+SHA256:
+  metadata.gz: 8098963e39a01b0a5da856c1c21b5b89344bd142f70534f5bc79b0e361a55fd9
+  data.tar.gz: c90e55495f6fd48b7a8425d4fbe5393aae2abb590f18f7f452c3ae5dce4162ae
 SHA512:
-  metadata.gz: 9c83fdd42b1ccb598dc1aa20ce78256a2fbfc93851924880a25b6ffc6eb1db5f45a662e55ed3499b43fdd90c95dfb4b0ff9a6f5f42740f0b68d49973663406e0
-  data.tar.gz: 82b4e8cbbc5bdfa4e531842ccb8a97a7f99d7a3ad7dad9df67d0e5d78e5a5f3aa33c879db83e9e4280222ba521886aee867a031caf49cec9c8aef078296b52a4
+  metadata.gz: 3ae240a2223dd8e0861ed9a80a0711f9d342aeeb6169c9e11e564db9bfbbd83ce75ac72eccc325883f7ef34aecd86f76de38605ae07e0f173b6b3ae852f44ea5
+  data.tar.gz: 3ba935eba5de0353e6ea1650c59e732e9e58d7bfc0f310a0e6b0ec92c0ea2a8776bf566b529f123fd78cda28e5511e200b5e0bfaeefd34cd84e1b6514a13e3b2

data/README.md

@@ -6,7 +6,9 @@
 
 The `db-clone` gem provides a rake task for cloning one database into another.  It does this by making a system call to `mysqldump` or `pg_dump` (currently only mysql and postgresql are supported) and uses the contents of your application's `database.yml` to determine the command line arguments.
 
-![Screenshot](https://cdn.rawgit.com/seanhuber/db-clone/master/screenshot.png)
+![Screenshot](https://cdn.rawgit.com/seanhuber/db-clone/master/db-clone_thumb.gif)
+
+![Screenshot](https://cdn.rawgit.com/seanhuber/db-clone/master/db-clone-danger_thumb.gif)
 
 ## Requirements
 

data/db-clone.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'colorize', '~> 0.7'
+  spec.add_dependency 'cli-ui', '~> 1.2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/db/clone.rb

@@ -1,4 +1,3 @@
-require 'colorize'
 require 'yaml'
 
 require 'db/clone/cmd_builder.rb'

data/lib/db/clone/base.rb

@@ -20,34 +20,39 @@ module Db
 
         cmd_builder = CmdBuilder.new src: @db_yml[src_db], dest: @db_yml[dest_db]
 
-        puts "\n  Executing: #{cmd_builder.cmd.light_blue}\n\n"
-        exec cmd_builder.cmd
+        frame("Cloning #{src_db} into #{dest_db}") do
+          unless !invoke_cli || ask_yes_no("Continue?", default_to_yes: dest_db != @default_src)
+            puts fmt("\n{{x}} Cloning canceled.")
+            abort
+          end
+
+          puts fmt("\n  Executing: {{cyan:#{cmd_builder.cmd}}}\n\n")
+          Process.wait spawn(cmd_builder.cmd)
+          puts fmt("\n{{v}} Cloning complete!")
+        end
       end
 
       private
 
       def prompt_for_src_and_dest
-        databases = @db_yml.keys.sort
-        default_src = databases.include?(@default_src) ? @default_src : databases.first
+        frame('Manual DB Selection') do
+          databases = @db_yml.keys
 
-        src_db = prompt 'Which is the source database?', default_src, databases.map{|name| [name, name.yellow]}.to_h
-        puts "Source database = #{src_db.green}"
+          default_src = databases.include?(@default_src) ? @default_src : databases.first
 
-        databases.delete src_db
-        default_dest = src_db != @default_dest && databases.include?(@default_dest) ? @default_dest : databases.first
+          src_db = prompt 'Which is the source database?', default_src, databases.map { |name| [name, fmt("{{reset:#{name}}}")] }.to_h
 
-        dest_db = prompt 'Which is the destination database?', default_dest, databases.map{|name| [name, name.yellow]}.to_h
-        puts "Destination database = #{dest_db.green}"
+          databases.delete src_db
+          default_dest = src_db != @default_dest && databases.include?(@default_dest) ? @default_dest : databases.first
 
-        if dest_db == @default_src
-          proceed = ask_yes_no "#{'WARNING!'.black.on_yellow} You have selected #{@default_src.green} as your destination database, meaning that db-clone will overwrite it with the contents of your #{src_db.green} database. Do you want to proceed anyway?", false
-          unless proceed
-            puts "\nCloning #{'canceled'.red}."
-            abort
+          dest_db = prompt 'Which is the destination database?', default_dest, databases.map {|name| [name, colorize_destination(name)]}.to_h
+
+          if dest_db == @default_src
+            puts fmt("{{bold:{{yellow:WARNING!}} You have selected {{green:#{@default_src}}} as your destination database, meaning that db-clone will overwrite it with the contents of your {{green:#{src_db}}} database.}}")
           end
-        end
 
-        [src_db, dest_db]
+          [src_db, dest_db]
+        end
       end
 
       def default_src_and_dest
@@ -56,6 +61,19 @@ module Db
 
         [@default_src, @default_dest]
       end
+
+      def colorize_destination(database_name)
+        color = case database_name
+                when @default_src
+                  'red'
+                when @default_dest
+                  'green'
+                else
+                  'yellow'
+                end
+
+        fmt("{{#{color}:#{database_name}}}")
+      end
     end
   end
 end

data/lib/db/clone/cmd_prompt.rb

@@ -1,45 +1,40 @@
+require 'cli/ui'
+
+CLI::UI::StdoutRouter.enable
+
 module Db
   module Clone
     module CmdPrompt
-      # def ask_for_text instruction, default_text=nil
-      #   if default_text
-      #     print "\n#{instruction} [default = \"#{default_text}\"]: "
-      #   else
-      #     print "\n#{instruction}: "
-      #   end
-      #   text = STDIN.gets.chomp.strip
-      #   text = default_text if text.blank? && default_text
-      #   text
-      # end
+      def frame(title)
+        CLI::UI::Frame.open(title) do
+          yield
+        end
+      end
 
-      def ask_yes_no question, default_to_yes=true
-        print "\n#{question} [#{default_to_yes ? 'Yn' : 'yN'}]: "
-        answer = STDIN.gets.chomp.strip.downcase
-        default_to_yes ? !(answer == 'n') : answer == 'y'
+      def ask_yes_no question, default_to_yes: true
+        if default_to_yes
+          CLI::UI.confirm question
+        else
+          CLI::UI.ask(question, options: %w(no yes)) == 'yes'
+        end
       end
 
       def prompt question, default, options={}
-        default_num = nil
-        numbered_opts = options.map.with_index do |opt, idx|
-          default_num = idx+1 if opt[0] == default
-          [idx+1, {ret_key: opt[0], label: opt[1]}]
-        end.to_h
+        opts = options.reject { |key,| key == default }
+        default_option = options[default]
 
-        puts "\n"
-        numbered_opts.each{|choice_num, opt| puts "  [#{choice_num.to_s.white}] #{opt[:label]}" }
+        CLI::UI::Prompt.ask(question) do |handler|
+          handler.option(default_option) { default }
 
-        print "\n#{question} [1-#{options.length}, default=#{default_num}]: "
-
-        selection = STDIN.gets.chomp.strip.to_i
-        selection = default_num if selection.zero?
-
-        if numbered_opts.has_key? selection
-          numbered_opts[selection][:ret_key]
-        else
-          puts "#{'Invalid selection:'.red} #{selection}"
-          prompt question, default, options
+          opts.each do |(value, text)|
+            handler.option(text.to_s) { value }
+          end
         end
       end
+
+      def fmt text
+        CLI::UI.fmt text
+      end
     end
   end
 end

data/lib/db/clone/version.rb

@@ -1,5 +1,5 @@
 module Db
   module Clone
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: db-clone
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Huber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,14 +111,15 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- db-clone-danger_thumb.gif
 - db-clone.gemspec
+- db-clone_thumb.gif
 - lib/db/clone.rb
 - lib/db/clone/base.rb
 - lib/db/clone/cmd_builder.rb
 - lib/db/clone/cmd_prompt.rb
 - lib/db/clone/rake_task.rb
 - lib/db/clone/version.rb
-- screenshot.png
 homepage: https://github.com/seanhuber/db-clone
 licenses:
 - MIT
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: rake db:clone will clone your production database to development