wordmove 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d14ebc79a6e190d6a74540faf95ab6931502e9e
-  data.tar.gz: 5c69f7aaf4a9a9f1fd1942a9c3755e587a52c9ce
+  metadata.gz: 7341b9b9fd7971ddd89434ebddb505d167173518
+  data.tar.gz: 59d250bb978004ce16056e406b5bbd8971986ab1
 SHA512:
-  metadata.gz: cd3936ef0124b37c65762e7286bf458fd173fa89c150e19cb59a566fd71a313f0bc8877a57051c5424da37ba4c074dc7f964d415c6b5123936f8724cccb57e0f
-  data.tar.gz: 288a5598cce59dd0cc55e74cb3edf1fb07821a703b79b801441f7a5a582ada06468200f34f8c18b4d407e8937ae9008c9d9c946aaaa561000cecdb2bec9b9f8b
+  metadata.gz: 802fef7e62907e3c2f26597cac0e5e229ff5bb7110ff02c700d77fcece4138ef1df4fde200d7cd57dcb4fd6bb5f9c1924b40dad17d3a5cd215120e5b7a7320fb
+  data.tar.gz: 327a3b94b37d374df03485a334ee415dc53bbd7893a340dd36d115ef98f257470a5760f5d793081d64dbde706b197c32fe8ab7a7bec1c6b7a2d7b70b6ae753d3

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3

data/Gemfile.lock

@@ -1,54 +1,43 @@
 PATH
   remote: .
   specs:
-    wordmove (1.0.5)
+    wordmove (1.0.14)
       activesupport
       colored
       i18n
-      photocopier (>= 0.0.6)
+      photocopier (>= 0.0.8)
       rake
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.13)
     colored (1.2)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
     diff-lcs (1.1.3)
     escape (0.0.4)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    i18n (0.6.4)
-    json (1.7.5)
-    multi_json (1.7.0)
-    net-scp (1.1.0)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.7.9)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
+    net-ssh (2.6.8)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    photocopier (0.0.6)
+    photocopier (0.0.8)
       activesupport
       escape
       i18n
       net-scp
       net-ssh
       net-ssh-gateway
-    rake (10.0.3)
+    rake (10.1.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -57,13 +46,14 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
-    thor (0.17.0)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cucumber
   rspec
   wordmove!

data/README.mdown

@@ -6,6 +6,8 @@ the remote staging server. SSH and FTP connections are both supported.
 
 Think of it like Capistrano for Wordpress, complete with push/pull capabilities.
 
+[![Build Status](https://travis-ci.org/welaika/wordmove.png?branch=master)](https://travis-ci.org/welaika/wordmove)
+
 ## Installation
 
 That's easy:
@@ -42,21 +44,24 @@ You can configure Wordmove creating a `Movefile`. That's just a YAML file with a
 ```yaml
 local:
   vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
+  wordpress_path: "/home/john/sites/your_site" # use an absolute path here
+
   database:
     name: "database_name"
     user: "user"
     password: "password"
     host: "127.0.0.1"
+
 staging:
   vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  # paths: # you can customize wordpress internal paths
-  #   wp_content: "wp-content"
-  #   uploads: "wp-content/uploads"
-  #   plugins: "wp-content/plugins"
-  #   themes: "wp-content/themes"
-  #   languages: "wp-content/languages"
+  wordpress_path: "/var/www/your_site" # use an absolute path here
+
+  database:
+    name: "database_name"
+    user: "user"
+    password: "password"
+    host: "host"
+
   exclude:
     - ".sass-cache"
     - ".git"
@@ -65,25 +70,33 @@ staging:
     - "wp-content/*.sql"
     - "Gemfile*"
     - "Movefile"
-  database:
-    name: "database_name"
-    user: "user"
-    password: "password"
-    host: "host"
+    - "wp-config.php"
+
+  # paths: # you can customize wordpress internal paths
+  #   wp_content: "wp-content"
+  #   uploads: "wp-content/uploads"
+  #   plugins: "wp-content/plugins"
+  #   themes: "wp-content/themes"
+  #   languages: "wp-content/languages"
+  #   themes: "wp-content/themes"
+
   # ssh:
   #   host: "host"
   #   user: "user"
   #   password: "password" # password is optional, will use public keys if available.
   #   port: 22 # Port is optional
+  #   rsync_options: "--verbose" # Additional rsync options, optional
   #   gateway: # Gateway is optional
   #     host: "host"
   #     user: "user"
   #     password: "password" # password is optional, will use public keys if available.
+
   # ftp:
   #   user: "user"
   #   password: "password"
   #   host: "host"
   #   passive: true
+
 # production: # multiple environments can be specified
 #   [...]
 ```

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
+
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/wordmove/core_ext.rb

@@ -0,0 +1,11 @@
+class Hash
+  def recursive_symbolize_keys!
+    symbolize_keys!
+    values.select do |v|
+      v.is_a? Hash
+    end.each do |h|
+      h.recursive_symbolize_keys!
+    end
+  end
+end
+

data/lib/wordmove/deployer/base.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext'
+require 'wordmove/core_ext'
 require 'wordmove/logger'
 require 'wordmove/wordpress_directory'
 require 'wordmove/sql_mover'
@@ -12,42 +13,70 @@ module Wordmove
       attr_reader :logger
       attr_reader :environment
 
-      def self.deployer_for(cli_options)
-        options = fetch_movefile(cli_options[:config])
-        available_enviroments = options.keys.map(&:to_sym) - [ :local ]
-        options.merge!(cli_options)
-        recursive_symbolize_keys!(options)
+      class << self
+        def deployer_for(cli_options)
+          options = fetch_movefile(cli_options[:config])
+          available_enviroments = extract_available_envs(options)
+          options.merge!(cli_options).recursive_symbolize_keys!
 
-        if available_enviroments.size > 1 && options[:environment].nil?
-          raise "You need to specify an environment with --environment parameter"
+          if available_enviroments.size > 1 && options[:environment].nil?
+            raise "You need to specify an environment with --environment parameter"
+          end
+          environment = (options[:environment] || available_enviroments.first).to_sym
+
+          if options[environment][:ftp]
+            require 'wordmove/deployer/ftp'
+            FTP.new(environment, options)
+          elsif options[environment][:ssh]
+            require 'wordmove/deployer/ssh'
+            SSH.new(environment, options)
+          else
+            raise StandardError, "No valid adapter found."
+          end
         end
 
-        environment = (options[:environment] || available_enviroments.first).to_sym
+        def extract_available_envs(options)
+          options.keys.map(&:to_sym) - [ :local ]
+        end
 
-        if options[environment][:ftp]
-          require 'wordmove/deployer/ftp'
-          FTP.new(environment, options)
-        elsif options[environment][:ssh]
-          require 'wordmove/deployer/ssh'
-          SSH.new(environment, options)
-        else
-          raise Thor::Error, "No valid adapter found."
+        def fetch_movefile(name = nil, start_dir = current_dir)
+          name ||= "Movefile"
+          entries = Dir["#{File.join(start_dir, name)}*"]
+
+          if entries.empty?
+            if last_dir?(start_dir)
+              raise StandardError, "Could not find a valid Movefile"
+            else
+              return fetch_movefile(name, upper_dir(start_dir))
+            end
+          end
+
+          found = entries.first
+          logger.task("Using Movefile: #{found}")
+          YAML::load(File.open(found))
+        end
+
+        def current_dir
+          '.'
         end
-      end
 
-      def self.fetch_movefile(path)
-        path ||= "Movefile"
-        unless File.exists?(path)
-          raise Thor::Error, "Could not find a valid Movefile"
+        def last_dir?(directory)
+          directory == "/" || File.exists?(File.join(directory, 'wp-config.php'))
+        end
+
+        def upper_dir(directory)
+          File.expand_path(File.join(directory, '..'))
+        end
+
+        def logger
+          Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
         end
-        YAML::load(File.open(path))
       end
 
       def initialize(environment, options = {})
         @environment = environment.to_sym
         @options = options
-        @logger = Logger.new(STDOUT)
-        @logger.level = Logger::DEBUG
+        @logger = self.class.logger
       end
 
       def push_db;
@@ -184,14 +213,6 @@ module Wordmove
       def local_options
         options[:local].clone
       end
-
-      private
-
-      def self.recursive_symbolize_keys! hash
-        hash.symbolize_keys!
-        hash.values.select{|v| v.is_a? Hash}.each{|h| recursive_symbolize_keys!(h)}
-      end
-
     end
 
   end

data/lib/wordmove/deployer/ftp.rb

@@ -10,8 +10,7 @@ module Wordmove
       def initialize(environment, options)
         super
         ftp_options = remote_options[:ftp]
-        @copier = Photocopier::FTP.new(ftp_options)
-        @copier.logger = logger
+        @copier = Photocopier::FTP.new(ftp_options).tap { |c| c.logger = logger }
       end
 
       def push_db

data/lib/wordmove/deployer/ssh.rb

@@ -7,8 +7,7 @@ module Wordmove
       def initialize(environment, options)
         super
         ssh_options = remote_options[:ssh]
-        @copier = Photocopier::SSH.new(ssh_options)
-        @copier.logger = logger
+        @copier = Photocopier::SSH.new(ssh_options).tap { |c| c.logger = logger }
       end
 
       def push_db

data/lib/wordmove/generators/Movefile

@@ -1,21 +1,23 @@
 local:
   vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
+  wordpress_path: "/home/john/sites/your_site" # use an absolute path here
+
   database:
     name: "database_name"
     user: "user"
     password: "password"
     host: "127.0.0.1"
+
 staging:
   vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  # paths: # you can customize wordpress internal paths
-  #   wp_content: "wp-content"
-  #   uploads: "wp-content/uploads"
-  #   plugins: "wp-content/plugins"
-  #   themes: "wp-content/themes"
-  #   languages: "wp-content/languages"
-  #   themes: "wp-content/themes"
+  wordpress_path: "/var/www/your_site" # use an absolute path here
+
+  database:
+    name: "database_name"
+    user: "user"
+    password: "password"
+    host: "host"
+
   exclude:
     - ".sass-cache"
     - ".git"
@@ -25,25 +27,32 @@ staging:
     - "Gemfile*"
     - "Movefile"
     - "wp-config.php"
-  database:
-    name: "database_name"
-    user: "user"
-    password: "password"
-    host: "host"
+
+  # paths: # you can customize wordpress internal paths
+  #   wp_content: "wp-content"
+  #   uploads: "wp-content/uploads"
+  #   plugins: "wp-content/plugins"
+  #   themes: "wp-content/themes"
+  #   languages: "wp-content/languages"
+  #   themes: "wp-content/themes"
+
   # ssh:
   #   host: "host"
   #   user: "user"
   #   password: "password" # password is optional, will use public keys if available.
   #   port: 22 # Port is optional
+  #   rsync_options: "--verbose" # Additional rsync options, optional
   #   gateway: # Gateway is optional
   #     host: "host"
   #     user: "user"
   #     password: "password" # password is optional, will use public keys if available.
+
   # ftp:
   #   user: "user"
   #   password: "password"
   #   host: "host"
   #   passive: true
+
 # production: # multiple environments can be specified
 #   [...]
 

data/lib/wordmove/version.rb

@@ -1,4 +1,4 @@
 module Wordmove
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end
 

data/spec/deployer/base_spec.rb

@@ -0,0 +1,85 @@
+require 'wordmove/deployer/base'
+require 'tempfile'
+
+describe Wordmove::Deployer::Base do
+  let(:klass) { Wordmove::Deployer::Base }
+
+  context "::fetch_movefile" do
+    TMPDIR = "/tmp/wordmove"
+
+    let(:path) { File.join(TMPDIR, 'Movefile') }
+    let(:yaml) { "name: Waldo\njob: Hider" }
+
+    before do
+      FileUtils.mkdir(TMPDIR)
+      klass.stub(:current_dir).and_return(TMPDIR)
+      klass.stub(:logger).and_return(double('logger').as_null_object)
+    end
+
+    after do
+      FileUtils.rm_rf(TMPDIR)
+    end
+
+    context "when Movefile is missing" do
+      it 'raises an exception' do
+        expect { klass.fetch_movefile }.to raise_error(StandardError)
+      end
+    end
+
+    context "when Movefile is present" do
+      before do
+        File.open(path, 'w') { |f| f.write(yaml) }
+      end
+
+      it 'finds a Movefile in current dir' do
+        result = klass.fetch_movefile
+        expect(result['name']).to eq('Waldo')
+        expect(result['job']).to eq('Hider')
+      end
+
+      context "when Movefile has extensions" do
+        let(:path) { File.join(TMPDIR, 'Movefile.yml') }
+
+        it 'finds it aswell' do
+          result = klass.fetch_movefile
+          expect(result['name']).to eq('Waldo')
+          expect(result['job']).to eq('Hider')
+        end
+      end
+
+      context "directories traversal" do
+        before do
+          @test_dir = File.join(TMPDIR, "test")
+          FileUtils.mkdir(@test_dir)
+          klass.stub(:current_dir).and_return(@test_dir)
+        end
+
+        it 'goes up through the directory tree and finds it' do
+          result = klass.fetch_movefile
+          expect(result['name']).to eq('Waldo')
+          expect(result['job']).to eq('Hider')
+        end
+
+        context 'Movefile not found, met root node' do
+          it 'raises an exception' do
+            klass.stub(:current_dir).and_return('/tmp')
+            expect { klass.fetch_movefile }.to raise_error(StandardError)
+          end
+        end
+
+        context 'Movefile not found, found wp-config.php' do
+          before do
+            FileUtils.touch(File.join(@test_dir, "wp-config.php"))
+          end
+
+          it 'raises an exception' do
+            expect { klass.fetch_movefile }.to raise_error(StandardError)
+          end
+        end
+      end
+
+    end
+  end
+
+end
+

data/spec/sql_mover_spec.rb

@@ -3,9 +3,9 @@ require 'tempfile'
 
 describe Wordmove::SqlMover do
 
-  let(:sql_path) { stub }
-  let(:source_config) { stub }
-  let(:dest_config) { stub }
+  let(:sql_path) { double }
+  let(:source_config) { double }
+  let(:dest_config) { double }
   let(:sql_mover) {
     Wordmove::SqlMover.new(
       sql_path,

data/wordmove.gemspec

@@ -20,11 +20,18 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor"
   gem.add_dependency "activesupport"
   gem.add_dependency "i18n"
-  gem.add_dependency "photocopier", ">= 0.0.7"
+  gem.add_dependency "photocopier", ">= 0.0.8"
 
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "cucumber"
-  gem.add_development_dependency "aruba"
 
-  gem.post_install_message = "Beware! We have changed the wordmove flags' behaviour: they used to tell wordmove what to _skip_, now they tell what to _include_. Read `wordmove help` for more info."
+  gem.post_install_message = <<-EOF
+
+============================================================================
+Beware! From version 1.0, we have changed the wordmove flags' behaviour:
+they used to tell wordmove what to _skip_, now they tell what to _include_.
+
+Read `wordmove help` for more info.
+============================================================================
+
+  EOF
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,34 +109,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Capistrano for Wordpress
 email:
 - stefano.verna@welaika.com
@@ -148,7 +120,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-version
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.mdown
@@ -158,6 +132,7 @@ files:
 - lib/wordmove/assets/dump.php.erb
 - lib/wordmove/assets/import.php.erb
 - lib/wordmove/cli.rb
+- lib/wordmove/core_ext.rb
 - lib/wordmove/deployer/base.rb
 - lib/wordmove/deployer/ftp.rb
 - lib/wordmove/deployer/ssh.rb
@@ -169,6 +144,7 @@ files:
 - lib/wordmove/wordpress_directory.rb
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
+- spec/deployer/base_spec.rb
 - spec/fixtures/Movefile
 - spec/spec_helper.rb
 - spec/sql_mover_spec.rb
@@ -176,9 +152,15 @@ files:
 homepage: https://github.com/welaika/wordmove
 licenses: []
 metadata: {}
-post_install_message: 'Beware! We have changed the wordmove flags'' behaviour: they
-  used to tell wordmove what to _skip_, now they tell what to _include_. Read `wordmove
-  help` for more info.'
+post_install_message: |2+
+
+  ============================================================================
+  Beware! From version 1.0, we have changed the wordmove flags' behaviour:
+  they used to tell wordmove what to _skip_, now they tell what to _include_.
+
+  Read `wordmove help` for more info.
+  ============================================================================
+
 rdoc_options: []
 require_paths:
 - lib
@@ -199,6 +181,7 @@ signing_key:
 specification_version: 4
 summary: Capistrano for Wordpress
 test_files:
+- spec/deployer/base_spec.rb
 - spec/fixtures/Movefile
 - spec/spec_helper.rb
 - spec/sql_mover_spec.rb