caravan 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cb58e3b687de82078f8648801e4e601c43f5697
-  data.tar.gz: 196ee1ea409f031f64fa91dc56ecc6e03014aa15
+  metadata.gz: f04af0c92d6322edaa0e750792d9377184adec46
+  data.tar.gz: d02d0c1601d98d6e0f1e33050113fbe5b7bb94e3
 SHA512:
-  metadata.gz: feebfb9d0d2a2fa2ac2a826b8475f38197ffa34ca0aa5c282acc3338ff7d3a34dc27fa3347fd3783d0e4b4da011f3b8c4d9c7e9da73c6fbeaeb2700d8fe0eb7a
-  data.tar.gz: 527d1d49aa71bafeb85f4ef5f5709f55abd682b02d69437e1957eb4a0cbaee1c87ade0ba4f564028983ee9fd5157e7c008d790d5876a04eccee7f9da46bb4b38
+  metadata.gz: 5bd169ffcb6a9f6caf6d9f912926085fce3a5cf3a09930690465ff0eb0b333d004344485fc0c0dbdacef86195a26d73ee3ddc865c4e76524bb006660ea05eb92
+  data.tar.gz: efb1b60eb0a047213f423f90f3c9a2270f10ccdc62b5100f6ec9034c23b7d192c4035ee422225cb4cc94b48df7315f47ba32d79f7c5d9c883ac1cd3293451190

data/.rubocop.yml

@@ -0,0 +1,4 @@
+Style/StringLiterals:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 30

data/.travis.yml

@@ -1,10 +1,19 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.0
   - 2.4.0
-after_success:
-  - CODECLIMATE_REPO_TOKEN=b72ccd136db6874a3d5dd842c50c1dc0933a1f49a02c55ce8567ec7311600af3 bundle exec codeclimate-test-reporter
+  - 2.5.0
+env:
+  global:
+    - CC_TEST_REPORTER_ID=b72ccd136db6874a3d5dd842c50c1dc0933a1f49a02c55ce8567ec7311600af3
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rake test
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 notifications:
   email: false
   slack: navyblue-team:ioO5diAGc5WUQVDKc5BH1UbE

data/README.md

@@ -11,7 +11,7 @@ The scenario is when we are developing in your local workspace and the program o
 
 ![](/assets/civ-5-caravan.png)
 
-This is the caravan in Sid Meier's Civilization V, which the project name originally comes from.
+This is the caravan in [Sid Meier's Civilization V](http://www.civilization5.com/), which the project name originally comes from.
 
 ## Installation
 
@@ -79,12 +79,22 @@ You may also write `src` and `dst` to `caravan.yml`. Hence, deployment made even
 $ caravan
 ```
 
+### Deploy Modes
+
+* shell
+    * `cp` in local.
+* scp
+    * `scp` to remote machines, _not recommended_.
+* [rsync](https://rsync.samba.org/)
+    * `rsync` to remote machines, which is the default and recommended mode because it is incremental. Thus, it performs much better.
+* rsync_local
+    * `rsync` in local.
+
 ## Plan
 
 - [x] Basic watching and deploying
 - [x] Exclude watching unwanted files
 - [x] `caravan.yml` for project-specialized configuration
-- [ ] Watch and deploy only the changed file instead of the whole folder
 - [x] Callbacks for deployment
     - [x] `after_create`
     - [x] `after_change`

data/exe/caravan

@@ -10,6 +10,10 @@ option_parser = OptionParser.new do |opts|
   opts.banner = "Caravan #{Caravan::VERSION}\nCopyright (c) David Zhang 2018\n"
   opts.separator ""
 
+  opts.on("-l YAML_NAME", "--load YAML_NAME", "YAML path") do |value|
+    options[:yaml] = value
+  end
+
   opts.on("-s SOURCE_PATH", "--source SOURCE_PATH", "Source path") do |value|
     options[:src] = value
   end
@@ -30,12 +34,10 @@ option_parser = OptionParser.new do |opts|
     end
   end
 
-  options[:once] = false
   opts.on("-o", "--once", "Deploy for once") do
     options[:once] = true
   end
 
-  options[:debug] = false
   opts.on("-b", "--debug", "Debug mode") do
     options[:debug] = true
   end
@@ -56,7 +58,11 @@ if ARGV.length == 0
   merged_conf = Caravan::Config.merge({}, Caravan.process_conf("."))
 else
   option_parser.parse!(ARGV)
-  merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
+  if options.key?(:yaml)
+    merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src], options[:yaml]))
+  else
+    merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
+  end
 end
 
 if merged_conf.key?("src") && merged_conf.key?("dst") && merged_conf.key?("deploy_mode")

data/lib/caravan.rb

@@ -37,7 +37,7 @@ module Caravan
         exit(0)
       end
       listener.start
-      
+
       trap("INT") do
         listener.stop
         deployer.before_destroy
@@ -52,6 +52,7 @@ module Caravan
       deployer.before_deploy
       deployer.run
       deployer.after_deploy
+      Caravan::Message.success("Deployed once.")
     end
 
     def create_listener(deployer, src_path)
@@ -64,12 +65,10 @@ module Caravan
       end
     end
 
-    def process_conf(src_path)
+    def process_conf(src_path, yaml_name = Caravan::Config.default_conf_name)
       Caravan::Message.success("Reading configuration...")
-      if src_path.nil?
-        src_path = '.'
-      end
-      user_config_path = File.join(File.expand_path(src_path), Caravan::Config.default_conf_name)
+      src_path = '.' if src_path.nil?
+      user_config_path = File.join(File.expand_path(src_path), yaml_name)
       conf = Caravan::Config.from(user_config_path)
       conf
     end

data/lib/caravan/message.rb

@@ -20,7 +20,7 @@ module Caravan
       end
 
       def success(msg)
-        puts "#{msg}".green
+        puts msg.green
       end
     end
   end

data/lib/caravan/version.rb

@@ -1,3 +1,3 @@
 module Caravan
-  VERSION = "0.6.2".freeze
+  VERSION = "0.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caravan
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - David Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -119,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile