glynn 1.0.11 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 97e79c9d356db219138794c973897b9e6df229b0
+  data.tar.gz: 8fa4e16bcc32bfeb2d82e8a3d0e1ecee1c85f0f0
+SHA512:
+  metadata.gz: 7a811cf2dee93667152c489d39053fd5813f7bc54295db79a3936ebb4efc66e6e4e17eaae782237e795e253f3aa3f3e819ee58d3bd14982908a1e5a80233401f
+  data.tar.gz: f514fe9529376ad92371eb206b8735a67433c0f2ba33f44159ddc6c8271b00a7e5550aa431e7cf66568cb6f19d89f569a76b9e89af0096066ee2022785661b81

data/bin/glynn

@@ -19,8 +19,9 @@ case ARGV.size
     options['ftp_username'] = ARGV[2]
     options['ftp_password'] = ARGV[3]
 end
-options = Jekyll.configuration(options)
+options  = Jekyll.configuration(options)
 ftp_port = (options['ftp_port'] || 21).to_i
+passive  = options['ftp_passive'] || true
 
 puts "Building site: #{options['source']} -> #{options['destination']}"
 jekyll = Glynn::Jekyll.new
@@ -52,7 +53,7 @@ rescue NoMethodError, Interrupt
   exit
 end
 
-ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {:username => username, :password => password})
+ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {:username => username, :password => password, :passive => passive})
 puts "\r\nConnected to server. Sending site"
 ftp.sync(options['destination'], options['ftp_dir'])
 puts "Successfully sent site"

data/lib/glynn/file.rb

@@ -2,7 +2,12 @@ module Glynn
   class File
 
     def self.is_bin?(f)
-      %x(file #{f}) !~ /text/
+      file_test = %x(file #{f})
+
+      # http://stackoverflow.com/a/8873922
+      file_test = file_test.encode('UTF-16', 'UTF-8', :invalid => :replace, :replace => '').encode('UTF-8', 'UTF-16')
+
+      file_test !~ /text/
     end
   end
 end

data/lib/glynn/ftp.rb

@@ -2,12 +2,13 @@ require 'net/ftp'
 
 module Glynn
   class Ftp
-    attr_reader :host, :port, :username, :password
+    attr_reader :host, :port, :username, :password, :passive
 
     def initialize(host, port = 21, options = Hash.new)
       options = {:username => nil, :password => nil}.merge(options)
       @host, @port = host, port
       @username, @password = options[:username], options[:password]
+      @passive = options[:passive]
     end
 
     def sync(local, distant)
@@ -19,7 +20,7 @@ module Glynn
     private
     def connect
       Net::FTP.open(host) do |ftp|
-        ftp.passive = true
+        ftp.passive = @passive
         ftp.connect(host, port)
         ftp.login(username, password)
         yield ftp
@@ -35,8 +36,9 @@ module Glynn
       end
       Dir.foreach(local) do |file_name|
         # If the file/directory is hidden (first character is a dot), we ignore it
-        next if file_name =~ /^\./
+        next if file_name =~ /^(\.|\.\.)$/
 
+        puts " -> " + file_name
         if ::File.stat(local + "/" + file_name).directory?
           # It is a directory, we recursively send it
           begin

data/lib/glynn/version.rb

@@ -1,3 +1,3 @@
 module Glynn
-  VERSION = '1.0.11'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.0.11
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365074332120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365074332120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70365074485020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365074485020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70365074484500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365074484500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables:
@@ -51,34 +59,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/glynn
 - lib/glynn.rb
 - lib/glynn/file.rb
 - lib/glynn/ftp.rb
 - lib/glynn/jekyll.rb
 - lib/glynn/version.rb
-- bin/glynn
 homepage: https://github.com/dmathieu/glynn
-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: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Deploy a jekyll weblog through ftp
 test_files: []
+has_rdoc: