wordmove 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f0c5761b7b67c9a56f5feffddc1abdc5597161
-  data.tar.gz: a8bd9fdb55dab809b61ff703a11190f5888550c2
+  metadata.gz: 362573df1a836d8861bc597eb36721c84a9cd92e
+  data.tar.gz: d676f1e50f275835eb2192821e931a1f2afca852
 SHA512:
-  metadata.gz: 189514b55cc4c9f4ff371292f8054f1b938f10f1d9f9c3901707817d4e3819a6dd6136fef62694e764354374f56eb91fbfaecbe9c65001d2ea0b8fdda784cea9
-  data.tar.gz: e6b160676eae31ec03de41fa5fc91c29df495072467c8169cd64816415cfb92ebce78b285964fe94e48cc0e0824023ba89b0b5430433c53556ca63bb3aa6f4ac
+  metadata.gz: 70a71176cf4a18597f4997f1c0bda8c63c2f1415b0fb48e04b13bbb586c9cbe38c32efec79699fc941cdeef511c490ea16961f4982d3ed71a308e463b26af085
+  data.tar.gz: 20047b933fd5e4b55f6c79c151df9559d34223d33d1d10dbcf3cfd268de014e410a0056a92f19cf030f328125fb3c2bbe441c840d0ded9fd851567a11700bdc6

data/README.mdown

@@ -41,12 +41,12 @@ Wordmove just acts as automation glue bewtween tools you already have and love.
 > wordmove help
 Tasks:
   wordmove help [TASK]  # Describe available tasks or one specific task
-  wordmove init         # Generates a brand new Movefile
+  wordmove init         # Generates a brand new movefile.yml
   wordmove pull         # Pulls WP data from remote host to the local machine
   wordmove push         # Pushes WP data from local machine to remote host
 ```
 
-Move inside the Wordpress folder and use `wordmove init` to generate a new `Movefile` and edit it with your settings. Read the next paragraph for more info.
+Move inside the Wordpress folder and use `wordmove init` to generate a new `movefile.yml` and edit it with your settings. Read the next paragraph for more info.
 
 **See the wiki article: [Usage and flags explained](https://github.com/welaika/wordmove/wiki/Usage-and-flags-explained) for more info.**
 
@@ -56,11 +56,11 @@ Move inside the Wordpress folder and use `wordmove init` to generate a new `Move
 * Pull database and uploads, adapting paths and urls: http://vimeo.com/74646861
 * Push only theme, transfer only modified files: http://vimeo.com/74647529
 
-## Movefile
+## movefile.yml
 
-You can configure Wordmove creating a `Movefile`. That's just a YAML file with local and remote host infos:
+You can configure Wordmove creating a `movefile.yml`. That's just a YAML file with local and remote host infos:
 
-```
+```yaml
 global:
   sql_adapter: "default"
 
@@ -101,6 +101,9 @@ production:
     - "tmp/*"
     - "Gemfile*"
     - "Movefile"
+    - "movefile"
+    - "movefile.yml"
+    - "movefile.yaml"
     - "wp-config.php"
     - "wp-content/*.sql"
 
@@ -123,7 +126,7 @@ See the [Windows (un)support disclaimer](https://github.com/welaika/wordmove/wik
 ### SSH
 
 * You need `rsync` on your machine; as far as we know it's already installed on OS X and Linux.
-* if you want to use your SSH public key for authentication,just delete the `production.ssh.password` field in your `Movefile`. Easy peasy.
+* if you want to use your SSH public key for authentication,just delete the `production.ssh.password` field in your `movefile.yml`. Easy peasy.
 * writing the password inside the move file was and is somewhat supported, but **we discourage this practice** in favor of password-less authentication with pub key. Read [here](https://github.com/welaika/wordmove/wiki/%5Bdeprecated%5D-SSH-password-inside-Movefile) for old informations.
 
 ### FTP
@@ -137,7 +140,7 @@ FTP support is [planned to be discontinued](https://github.com/welaika/wordmove/
 
 ### Multistage
 
-You can define multiple environments in your `Movefile`, such as production, staging, etc.
+You can define multiple environments in your `movefile.yml`, such as production, staging, etc.
 Use `-e` with `pull` or `push` to run the command on the specified environment.
 
 For example:

data/lib/wordmove/cli.rb

@@ -7,7 +7,7 @@ module Wordmove
       puts Wordmove::VERSION
     end
 
-    desc "init", "Generates a brand new Movefile"
+    desc "init", "Generates a brand new movefile.yml"
     def init
       Wordmove::Generators::Movefile.start
     end

data/lib/wordmove/deployer/base.rb

@@ -37,8 +37,11 @@ module Wordmove
         end
 
         def fetch_movefile(name = nil, start_dir = current_dir)
-          name ||= "Movefile"
-          entries = Dir["#{File.join(start_dir, name)}*"]
+          entries = if name.nil?
+                      Dir["#{File.join(start_dir, '{M,m}ovefile')}{,.yml,.yaml}"]
+                    else
+                      Dir["#{File.join(start_dir, name)}{,.yml,.yaml}"]
+                    end
 
           if entries.empty?
             raise MovefileNotFound, "Could not find a valid Movefile" if last_dir?(start_dir)
@@ -47,7 +50,7 @@ module Wordmove
 
           found = entries.first
           logger.task("Using Movefile: #{found}")
-          YAML.safe_load(ERB.new(File.read(found)).result)
+          YAML.safe_load(ERB.new(File.read(found)).result, [], [], true)
         end
 
         def current_dir

data/lib/wordmove/generators/movefile.rb

@@ -9,7 +9,7 @@ module Wordmove
       end
 
       def copy_movefile
-        template "Movefile"
+        template "movefile.yml"
       end
     end
   end

data/lib/wordmove/generators/{Movefile → movefile.yml}

@@ -32,6 +32,9 @@ production:
     - "tmp/*"
     - "Gemfile*"
     - "Movefile"
+    - "movefile"
+    - "movefile.yml"
+    - "movefile.yaml"
     - "wp-config.php"
     - "wp-content/*.sql.gz"
 

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "2.1.4".freeze
+  VERSION = "2.2.0".freeze
 end

data/wordmove.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.4.0"
 
-  spec.add_development_dependency "bundler", ">= 1.14.6"
+  spec.add_development_dependency "bundler", "~> 1.14", ">= 1.14.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "simplecov", "~> 0.9"
@@ -45,13 +45,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.49.0"
 
   spec.post_install_message = <<-RAINBOW
-    Starting from 2.0.0 Wordmove will compress SQL dumps both in remote and locale environments.
-    If something will broke, please check if gzip executable is present locally and
-    remotely. We are considering obvious it's installed in any web environment.
-
-    Starting from 2.1.0 you'll need to add the global section in your Movefile:
+    Starting from 2.1.0 you'll need to add the global section in your movefile.yaml:
         global:
             sql_adapter: "default"
     Or you can spawn a new one with `wordmove init` (backup the old one!)
+
+    Starting from 2.2.0 the default name of the config file is `movefile.yaml`.
   RAINBOW
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Stefano Verna
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -86,6 +86,9 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.6
@@ -93,6 +96,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.6
@@ -219,8 +225,8 @@ files:
 - lib/wordmove/deployer/ssh/default_sql_adapter.rb
 - lib/wordmove/deployer/ssh/wpcli_sql_adapter.rb
 - lib/wordmove/exceptions.rb
-- lib/wordmove/generators/Movefile
 - lib/wordmove/generators/movefile.rb
+- lib/wordmove/generators/movefile.yml
 - lib/wordmove/generators/movefile_adapter.rb
 - lib/wordmove/logger.rb
 - lib/wordmove/sql_adapter/default.rb
@@ -236,14 +242,12 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |2
-      Starting from 2.0.0 Wordmove will compress SQL dumps both in remote and locale environments.
-      If something will broke, please check if gzip executable is present locally and
-      remotely. We are considering obvious it's installed in any web environment.
-
-      Starting from 2.1.0 you'll need to add the global section in your Movefile:
+      Starting from 2.1.0 you'll need to add the global section in your movefile.yaml:
           global:
               sql_adapter: "default"
       Or you can spawn a new one with `wordmove init` (backup the old one!)
+
+      Starting from 2.2.0 the default name of the config file is `movefile.yaml`.
 rdoc_options: []
 require_paths:
 - lib