guard-autoupload 0.3.6 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2a76d209ee938526ce9381c587699b936fd4e29f
+  data.tar.gz: ac65618097d9d518ba890d75b879146cd1f430aa
+SHA512:
+  metadata.gz: 390b6e1683a9dc0ee7b3e5bfa1530d59b7d16e24174d28b658012f8e824bc9a95910637934ab8b1f40f3ed1188602903152a15652da2f7f6a2d9f984c6f1fcac
+  data.tar.gz: e6ac7b7886cc8285a7e09fa475a6b17c9f0762e9cd36af8b8a930f9a5f10f334bc338b6c432544665ed45923abc11dbc4ff2e63ff4a3d972dbec6026e6bc23a1

data/.gitignore

@@ -58,7 +58,6 @@ local.properties
 *.tlb
 *.tli
 *.tlh
-*.tmp
 *.vspscc
 .builds
 *.dotCover
@@ -164,3 +163,4 @@ pip-log.txt
 
 # Ignore built gems
 *.gem
+/.idea/

data/Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+
+require 'rbconfig'
+gem 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+
+group :development do
+  gem 'guard'
+end

data/Gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    guard-autoupload (0.4.1)
+      guard (~> 2.6)
+      net-sftp (~> 2.1)
+      net-ssh-simple (~> 1.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    blockenspiel (0.4.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.6.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    hashie (2.1.1)
+    listen (2.7.2)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.5)
+    method_source (0.8.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.8.0)
+    net-ssh-simple (1.6.5)
+      blockenspiel (~> 0.4.3)
+      hashie (>= 1.1.0)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.8.0)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.3.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    slop (3.5.0)
+    thor (0.19.1)
+    timers (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  guard
+  guard-autoupload!
+  rake

data/Guardfile

@@ -0,0 +1,23 @@
+# Configuartion Options for guard-autoupload
+
+opts = {
+    :protocol => :scp,        # Protocol used to connect to remote host.
+    # Possible values are :scp, :sftp and :ftp.
+    # Of these :scp is the preferred one for
+    # its stability.
+    :host => "localhost",
+    # :port => 22,            # Uncomment this if you need to set port to
+    # something else than default.
+    :user => "jyrkililja",
+    :remote => "/Users/jyrkililja/projects/guard-development/test/",
+    :verbose => true,        # if true you get all outputs
+    :quiet => false           # if true outputs only on exceptions.
+}
+
+guard :autoupload, opts do
+  watch(/^./)
+  ignore [%r{^.idea},
+          %r{^Guardfile}, #ignore the root guardfile
+          %r{__jb_old__}, %r{__jb_bak__}  # ruby idea ingores
+         ]
+end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Jyrki Lilja
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,11 +1,23 @@
-guard-autoupload
-================
+# guard-autoupload
 
 Autoupload plugin used for uploading all local changes to remote host.
 Uses either SFTP or FTP.
 
-Usage
------
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'guard-autoupload'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install guard-autoupload
+
+## Usage
 
 Sample guardfile:
 
@@ -30,22 +42,15 @@ Sample guardfile:
         # accidentally upload the credentials.
     end
 
-Dependencies
-------------
-
- - guard
- - Net::SFTP
- - Net::SSH::Simple
-
-Installation
-------------
-
-Finally the gem has been uploaded to rubygems. Install it with
+## Contributing
 
-    gem install guard-autoupload
+1. Fork it ( https://github.com/jyrkij/guard-autoupload/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
-Author
-------
+## Author
 
 This guard plugin was written by Jyrki Lilja and is used at FocusFlow.
 The code is hevily based on [vincenthu's guard-flopbox][gsftp] and

data/Rakefile

@@ -1,2 +1 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"

data/guard-autoupload.gemspec

@@ -1,23 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'guard/autoupload/version'
 
-Gem::Specification.new do |s|
-    s.name        = "guard-autoupload"
-    s.version     = "0.3.6"
-    s.authors     = ["Jyrki Lilja"]
-    s.email       = ["jyrki dot lilja at outlook dot com"]
-    s.homepage    = "https://github.com/jyrkij/guard-autosync"
-    s.summary     = %q{Autoupload plugin - uploads local changes to remote host.}
-    s.description = %q{Uses either SFTP or FTP.}
+Gem::Specification.new do |spec|
+  spec.name          = "guard-autoupload"
+  spec.version       = Guard::AutouploadVersion::VERSION
+  spec.authors       = ["Jyrki Lilja"]
+  spec.email         = ["jyrki.lilja@focus.fi"]
+  spec.summary       = %q{Autoupload plugin - uploads local changes to remote host.}
+  spec.description   = %q{Uses either SFTP or FTP.}
+  spec.homepage      = "https://github.com/jyrkij/guard-autosync"
+  spec.license       = "MIT"
 
-    s.rubyforge_project = "guard-autoupload"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  
+  spec.add_runtime_dependency 'guard', '~> 2.6'
+  spec.add_runtime_dependency 'net-sftp', '~> 2.1'
+  spec.add_runtime_dependency 'net-ssh-simple', '~> 1.6'
 
-    s.files         = `git ls-files`.split("\n")
-    s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-    s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-    s.require_paths = ["lib"]
-
-    s.add_dependency('guard')
-    s.add_dependency('net-sftp')
-    s.add_dependency('net-ssh-simple')
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake", "~> 10.3"
 end

data/lib/guard/autoupload.rb

@@ -1,136 +1,141 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
-
 require 'guard'
-require 'guard/guard'
-require 'autoupload/scpsession.rb'
-require 'autoupload/sftpsession.rb'
-require 'autoupload/ftpsession.rb'
+require 'guard/plugin'
+require 'guard/autoupload/scpsession.rb'
+require 'guard/autoupload/sftpsession.rb'
+require 'guard/autoupload/ftpsession.rb'
+require 'kconv'
 
 module Guard
-    class Autoupload < Guard
-        def initialize(watchers = [], options = {})
-            super
-
-            @instance = self
-            if options[:protocol] == :scp
-                @session = SCPSession.new(
-                    options[:host],
-                    options[:port] || 22,
-                    options[:user],
-                    options[:password],
-                    self
-                )
-            elsif options[:protocol] == :sftp
-                @session = SFTPSession.new(
-                    options[:host],
-                    options[:port] || 22,
-                    options[:user],
-                    options[:password],
-                    @instance
-                )
-            elsif options[:protocol] == :ftp
-                @session = FTPSession.new(
-                    options[:host],
-                    options[:port] || 21,
-                    options[:user],
-                    options[:password]
-                )
-            else
-                throw :task_has_failed
-            end
-
-            @remote = options[:remote]
-            @local = Dir.pwd
-            @verbose = options[:verbose]
-            @quiet = options[:quiet] unless verbose?
-            output = options.dup
-            output[:password] = options[:password].gsub(/./, '*') if options.include? :password
-            log "Initialized with watchers #{watchers.inspect}" if verbose?
-            log "Initialized with options #{output.inspect}" unless quiet?
-        end
-
-        def run_on_change(paths)
-            paths.each do |path|
-                local_file = File.join(@local, path)
-                remote_file = File.join(@remote, path)
-
-                attempts = 0
-
-                begin
-                    log "Upload #{local_file} => #{remote_file}" if verbose?
-                    @session.upload!(local_file, remote_file)
-                    log "Uploaded #{path}" unless quiet?
-                rescue => ex
-                    log "Exception on uploading #{path}\n#{ex.inspect}"
-                    log ex.backtrace.join("\n") if verbose?
-                    attempts += 1
-                    remote_dir = File.dirname(remote_file)
-                    recursively_create_dirs(remote_dir)
-                    retry if attempts < 3
-                    log "Exceeded 3 attempts to upload #{path}"
-                    throw :task_has_failed
-                end
-            end
-
-            msg = "Uploaded:\n#{paths.join("\n")}"
-            ::Guard::Notifier.notify msg, :title => "Uploaded"
-        end
-
-        def run_on_removals(paths)
-            paths.each do |path|
-                remote_file = File.join(@remote, path)
+  class Autoupload < Plugin
+    def initialize(options = {})
+      super
+
+      @instance = self
+      if options[:protocol] == :scp
+        @session = SCPSession.new(
+        options[:host],
+        options[:port] || 22,
+        options[:user],
+        options[:password],
+        self
+        )
+      elsif options[:protocol] == :sftp
+        @session = SFTPSession.new(
+        options[:host],
+        options[:port] || 22,
+        options[:user],
+        options[:password],
+        @instance
+        )
+      elsif options[:protocol] == :ftp
+        @session = FTPSession.new(
+        options[:host],
+        options[:port] || 21,
+        options[:user],
+        options[:password]
+        )
+      else
+        throw :task_has_failed
+      end
+
+      @remote = options[:remote]
+      @local = Dir.pwd
+      @local_subpath = options[:local] || ''
+      @verbose = options[:verbose]
+      @quiet = options[:quiet] unless verbose?
+      output = options.dup
+      output[:password] = options[:password].gsub(/./, '*') if options.include? :password
+
+      UI.info("Initialized with watchers #{watchers.inspect}") if verbose?
+      UI.info("Initialized with options #{output.inspect}") unless quiet?
+    end
 
-                begin
-                    log "Delete #{remote_file}" if verbose?
-                    @session.remove!(remote_file)
-                rescue => ex
-                    log "Exception on deleting #{path}\n#{ex.inspect}"
-                    log ex.backtrace.join("\n") if verbose?
-                end
+    def run_on_change(paths)
+      paths.each do |path|
+        path = path.encode(Kconv::UTF8, Encoding::UTF8_MAC) if RUBY_PLATFORM.include? "darwin"
 
-                log "Deleted #{path}" unless quiet?
-            end
+        local_file = File.join(@local, path)
+        path.sub!(/^#{@local_subpath}/, '')
+        remote_file = File.join(@remote, path)
 
-            msg = "Deleted:\n#{paths.join("\n")}"
-            ::Guard::Notifier.notify msg, :title => "Deleted"
+        if(File.directory?(local_file))
+          next
         end
 
-        def verbose?
-            @verbose || false
+        attempts = 0
+
+        begin
+          UI.info("Upload #{local_file} => #{remote_file}") if verbose?
+          @session.upload!(local_file, remote_file)
+          UI.info("Uploaded #{path}") unless quiet?
+        rescue => ex
+          UI.error("Exception on uploading #{path}\n#{ex.inspect.toutf8}")
+          UI.error(ex.backtrace.join("\n")) if verbose?
+          attempts += 1
+          remote_dir = File.dirname(remote_file)
+          recursively_create_dirs(remote_dir)
+          retry if attempts < 3
+          UI.info("Exceeded 3 attempts to upload #{path}")
+          throw :task_has_failed
         end
+      end
 
-        def quiet?
-            @quiet || false
-        end
+      msg = "Uploaded:\n#{paths.join("\n")}"
+      UI.info(msg)
+      ::Guard::Notifier.notify "uploaded", :title => "Uploaded"
+    end
 
-        def log(message)
-            puts "[#{Time.now}] #{message}"
+    def run_on_removals(paths)
+      paths.each do |path|
+        path.sub!(/^#{@local_subpath}/, '')
+        remote_file = File.join(@remote, path)
+            
+        begin
+          UI.info("Delete #{remote_file}") if verbose?
+          @session.remove!(remote_file)
+        rescue => ex
+          UI.error("Exception on deleting #{path}\n#{ex.inspect.toutf8}")
+          UI.error(ex.backtrace.join("\n")) if verbose?
         end
+            
+        UI.info("Deleted #{path}") unless quiet?
+      end
+            
+      ::Guard::Notifier.notify "Deleted", :title => "Deleted"
+    end
 
-        def stop
-            log "Tearing down connections" unless quiet?
-            if @session.is_a? SCPSession
-                @session.close
-            end
-        end
+    def verbose?
+      @verbose || false
+    end
 
-        private
+    def quiet?
+      @quiet || false
+    end
 
-        def recursively_create_dirs(remote_dir)
-            new_dir = @remote
-            remote_dir.gsub(@remote, "").split("/").each do |dir|
-                new_dir = File.join(new_dir, dir)
+    def stop
+      UI.info("Tearing down connections") unless quiet?
+      if @session.is_a? SCPSession
+        @session.close
+      end
+    end
+
+    private
 
-                begin
-                    log "Creating #{new_dir}" if verbose?
-                    @session.mkdir!(new_dir)
-                rescue => ex
-                    log "Cannot create directory #{new_dir}\n#{ex.inspect}"
-                    log ex.backtrace.join("\n") if verbose?
-                end
-            end
+    def recursively_create_dirs(remote_dir)
+      new_dir = @remote
+      remote_dir.gsub(@remote, "").split("/").each do |dir|
+        new_dir = File.join(new_dir, dir)
 
-            log "Created directory #{remote_dir}" unless quiet?
+        begin
+          UI.info("Creating #{new_dir}") if verbose?
+          @session.mkdir!(new_dir)
+        rescue => ex
+          UI.info("Cannot create directory #{new_dir}\n#{ex.inspect.toutf8}")
+          UI.info(ex.backtrace.join("\n")) if verbose?
         end
+      end
+
+      UI.info("Created directory #{remote_dir}") unless quiet?
     end
+  end
 end

data/lib/guard/autoupload/ftpsession.rb

@@ -9,7 +9,7 @@ class FTPSession
         @user = user
         @password = password
         @last_timestamp = Time.new(0)
-        @session.connect(@host)
+        @session.connect(@host, port)
         @session.login(@user, @password)
     end
 

data/lib/guard/autoupload/scpsession.rb

@@ -12,7 +12,7 @@ class SCPSession
     end
 
     def ss
-        Thread.current[:simplessh] ||= Net::SSH::Simple.new({:user => @user, :password => @password.clone})
+        Thread.current[:simplessh] ||= Net::SSH::Simple.new({:user => @user, :password => @password})
     end
 
     def upload!(local, remote)

data/lib/guard/autoupload/templates/Guardfile

@@ -2,21 +2,24 @@
 
 opts = {
     :protocol => :scp,        # Protocol used to connect to remote host.
-                              # Possible values are :scp, :sftp and :ftp.
-                              # Of these :scp is the preferred one for
-                              # its stability.
+    # Possible values are :scp, :sftp and :ftp.
+    # Of these :scp is the preferred one for
+    # its stability.
     :host => "remote_host",
     # :port => 22,            # Uncomment this if you need to set port to
-                              # something else than default.
+    # something else than default.
     :user => "username",
     :password => "password",
     :remote => "remote_path",
-    :verbose => false,        # if true you get all outputs
+    :verbose => true,        # if true you get all outputs
     :quiet => false           # if true outputs only on exceptions.
 }
 
 guard :autoupload, opts do
-    watch(/^((?!Guardfile$).)*$/)
-    # Matches every other file but Guardfile. This way we don't
-    # accidentally upload the credentials.
+  watch(/^./)
+  ignore [%r{^.idea},
+          %r{^Guardfile}, #ignore the root guardfile
+          %r{__jb_old__}, %r{__jb_bak__}  # ruby idea ingores
+         ]
 end
+

data/lib/guard/autoupload/version.rb

@@ -0,0 +1,5 @@
+module Guard
+  module AutouploadVersion
+    VERSION = "1.0.0"
+  end
+end

metadata

@@ -1,74 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: guard-autoupload
 version: !ruby/object:Gem::Version
-  version: 0.3.6
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Jyrki Lilja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
 description: Uses either SFTP or FTP.
 email:
-- jyrki dot lilja at outlook dot com
+- jyrki.lilja@focus.fi
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitattributes
-- .gitignore
+- ".gitattributes"
+- ".gitignore"
 - Gemfile
+- Gemfile.lock
+- Guardfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - guard-autoupload.gemspec
@@ -77,28 +101,30 @@ files:
 - lib/guard/autoupload/scpsession.rb
 - lib/guard/autoupload/sftpsession.rb
 - lib/guard/autoupload/templates/Guardfile
+- lib/guard/autoupload/version.rb
 homepage: https://github.com/jyrkij/guard-autosync
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: guard-autoupload
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Autoupload plugin - uploads local changes to remote host.
 test_files: []
+has_rdoc: