cloner 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4327a76f4dbae0a838b04277cf1dfc42e40bd493a6557453fe20dd094ae7a017
-  data.tar.gz: 4b80a4c1ca652c01ab173b1711b84862a806c2318c246d700bd4abf21fa96cc0
+  metadata.gz: f8ad225c2837f9ea7b93560944d9ff6ad641e7d18df60c8cd4ac5524e939d79b
+  data.tar.gz: 4c69cf30e30e30802c8b8ad623717a2be50edba203504dfdae3fddac56ec64c0
 SHA512:
-  metadata.gz: 39f309d98f2cd91d9df01ed50a0805590f8272bbf3be16302ae12891e0b27982816d25be76da99e5c38930027c9c5b5db473e55ad21e4a6f4ef5375a7490de68
-  data.tar.gz: 7d2f51fc2ca8d95e509836970e1c74bdc5a1dba1a8a4f9da8b72361904b6ee86de67a59c0f322fcb75258879215c96198cf1c2bb9ebfe90b75944497b7686c45
+  metadata.gz: dde12ab0ebe23b74b0bcd341fd67fbf938167860fd09ed8b55a6948045fb35d25f863f6b6835ee72a18147a3127c127b4a9d1b2f2d6c7f40e31af68e6dc20ab6
+  data.tar.gz: 1d420ba6e269a1a6aa08339370ab4242181bd5f5db4b0185c9a641148c5fd25cc82a8964f820d582ac12294acd395b7a807ddc84f9f5937ec66a235dc290aa95

data/README.md

@@ -20,37 +20,44 @@ Or install it yourself as:
 
 ## Usage
 
-create ```lib/tasks/dl.thor``` with following content:
-
-    require 'cloner'
-
-    class Dl < Cloner::Base
-      no_commands do
-        def rails_path
-          File.expand_path("../../../config/environment", __FILE__)
-        end
-        def ssh_host
-          'hottea.ru'
-        end
-        def ssh_user
-          'tea'
-        end
-        def remote_dump_path
-          '/data/tea/dump'
-        end
-        def remote_app_path
-          "/data/tea/app/current"
-        end
-      end
-
-      desc "download", "clone files and DB from production"
-      def download
-        load_env
-        clone_db
-        rsync_public("ckeditor_assets")
-        rsync_public("uploads")
-      end
+For generate cloner base template, run:
+
+```
+bundle exec rails generate cloner
+```
+
+This is create `lib/tasks/dl.thor` file with following content:
+```ruby
+require 'cloner'
+
+class Dl < Cloner::Base
+  no_commands do
+    def rails_path
+      File.expand_path("../../../config/environment", __FILE__)
     end
+    def ssh_host
+      'hottea.ru'
+    end
+    def ssh_user
+      'tea'
+    end
+    def remote_dump_path
+      '/data/tea/dump'
+    end
+    def remote_app_path
+      "/data/tea/app/current"
+    end
+  end
+
+  desc "download", "clone files and DB from production"
+  def download
+    load_env
+    clone_db
+    rsync_public("ckeditor_assets")
+    rsync_public("uploads")
+  end
+end
+```
 
 Adjust it to your project and deployment.
 
@@ -58,6 +65,30 @@ Run it:
 
     thor dl
 
+
+If you generate extended cloner template as: `rails g cloner -e`,
+you can run `thor dl` with additional parameters, for example:
+```
+bundle exec thor dl -D # For skip clone database
+bundle exec thor dl -F # For skip clone files
+```
+
+For details see help:
+```
+bundle exec thor help dl:download
+
+Usage:
+  thor dl:download
+
+Options:
+      [--from=FROM]                            # stage name where cloner get data
+                                               # Default: production
+  -D, [--skip-database], [--no-skip-database]  # skip clone database
+  -F, [--skip-files], [--no-skip-files]        # skip clone files
+
+clone files and DB from production
+```
+
 ## Additional
 
 All functions from cloner/internal.rb can be overriden, for example:

data/cloner.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency 'net-ssh'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end
 

data/lib/cloner/mysql.rb

@@ -44,8 +44,8 @@ module Cloner::MySQL
 
   def my_dump_restore
     puts "restoring DB"
-    host = ar_conf['host'].present? ? " -h #{e ar_conf['host']}" : ""
-    port = ar_conf['port'].present? ? " -p #{e ar_conf['port']}" : ""
+    host = ar_conf['host'].present? ? " --host #{e ar_conf['host']}" : ""
+    port = ar_conf['port'].present? ? " --port #{e ar_conf['port']}" : ""
     restore = "#{my_bin_path 'mysql'} #{my_restore_param} --user #{e ar_conf['username']} #{my_local_auth}#{host}#{port} #{e ar_to} < #{e(my_path + '/cloner.sql')}"
     puts restore if verbose?
     pipe = IO.popen(restore)

data/lib/cloner/version.rb

@@ -1,4 +1,4 @@
 module Cloner
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end
 

data/lib/generators/cloner_generator.rb

@@ -0,0 +1,25 @@
+class ClonerGenerator < Rails::Generators::Base
+  source_root File.expand_path('templates', __dir__)
+
+  class_option :extend, default: false, type: :boolean, aliases: '-e'
+
+  desc "This generator create lib/tasks/dl.thor"
+  def create_task_file
+    unless options[:extend]
+      create_default_task_file
+    else
+      create_extended_task_file
+    end
+  end
+
+  private
+  def create_default_task_file
+    copy_file 'cloner_base.template', 'lib/tasks/dl.thor'
+  end
+
+  def create_extended_task_file
+    say 'Create extend file'
+    @username = Rails.application.class.parent_name.downcase
+    template 'cloner_extend.thor.erb', 'lib/tasks/dl.thor'
+  end
+end

data/lib/generators/templates/cloner_base.template

@@ -0,0 +1,29 @@
+require 'cloner'
+
+class Dl < Cloner::Base
+  no_commands do
+    def rails_path
+      File.expand_path("../../../config/environment", __FILE__)
+    end
+    def ssh_host
+      'hottea.ru'
+    end
+    def ssh_user
+      'tea'
+    end
+    def remote_dump_path
+      '/data/tea/dump'
+    end
+    def remote_app_path
+      "/data/tea/app/current"
+    end
+  end
+
+  desc "download", "clone files and DB from production"
+  def download
+    load_env
+    clone_db
+    rsync_public("ckeditor_assets")
+    rsync_public("uploads")
+  end
+end

data/lib/generators/templates/cloner_extend.thor.erb

@@ -0,0 +1,72 @@
+require 'cloner'
+
+class Dl < Cloner::Base
+  no_commands do
+    def rails_path
+      File.expand_path("../../../config/environment", __FILE__)
+    end
+    def stages
+      @_stages ||= {
+        # TODO: Add new stages here if you needed
+        production: {
+          # TODO: Fix production settings
+          ssh_host: 'production.example.com',
+          ssh_user: '<%= @username %>'
+        },
+        staging: {
+          # TODO: Fix staging settings
+          ssh_host: 'production.example.com',
+          ssh_user: '<%= @username %>'
+        }
+      }
+    end
+    def ssh_host
+      stages.dig(options[:from].to_sym, :ssh_host)
+    end
+    def ssh_user
+      stages.dig(options[:from].to_sym, :ssh_user)
+    end
+    def remote_dump_path
+      # TODO: Fix remote dump path
+      '/data/<%= @username %>/dump'
+    end
+    def remote_app_path
+      # TODO: Fix remote app path
+      '/data/<%= @username %>/app/current'
+    end
+  end
+
+  class_option :from,
+               default: 'production',
+               type: :string,
+               desc: 'stage name where cloner get data'
+  class_option :skip_database,
+               default: false,
+               type: :boolean,
+               aliases: '-D',
+               desc: 'skip clone database'
+  class_option :skip_files,
+               default: false,
+               type: :boolean,
+               aliases: '-F',
+               desc: 'skip clone files'
+
+  desc "download", "clone files and DB from production"
+  def download
+    load_env
+    say "Clone from: #{options[:from]}", :green
+    if options[:skip_database]
+      say "Skip clone database!", :yellow
+    else
+      clone_db
+    end
+
+    if options[:skip_files]
+      say "Skip clone files!", :yellow
+    else
+      # TODO: Fix folders for synchronization here
+      rsync_public("ckeditor_assets")
+      rsync_public("uploads")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -56,30 +56,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: ''
 email:
 - glebtv@gmail.com
@@ -106,6 +106,9 @@ files:
 - lib/cloner/rsync.rb
 - lib/cloner/ssh.rb
 - lib/cloner/version.rb
+- lib/generators/cloner_generator.rb
+- lib/generators/templates/cloner_base.template
+- lib/generators/templates/cloner_extend.thor.erb
 homepage: https://github.com/rs-pro/cloner
 licenses:
 - MIT
@@ -125,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily clone your production Mongoid database and files for local development