glynn 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e79c9d356db219138794c973897b9e6df229b0
-  data.tar.gz: 8fa4e16bcc32bfeb2d82e8a3d0e1ecee1c85f0f0
+  metadata.gz: d8392284c1b29c23af2b8d6d5d9438afe6c0c7ee
+  data.tar.gz: 4f5c215bd533659209b1f91841953c0fad15c4c3
 SHA512:
-  metadata.gz: 7a811cf2dee93667152c489d39053fd5813f7bc54295db79a3936ebb4efc66e6e4e17eaae782237e795e253f3aa3f3e819ee58d3bd14982908a1e5a80233401f
-  data.tar.gz: f514fe9529376ad92371eb206b8735a67433c0f2ba33f44159ddc6c8271b00a7e5550aa431e7cf66568cb6f19d89f569a76b9e89af0096066ee2022785661b81
+  metadata.gz: f58e78373d9f384b5ac5294fbc5768acd32b6dc334f67a54521248b927103923f08cef820cbce39571bffcd214814f0cbe2a0c756a39184df9b5f923451bbb18
+  data.tar.gz: 4b310a8b9e9587c45b94c3d19b573c63320d7426b6a86d9a28f3311cfb90fd3746db69b4a12012238eadcb60d69834221df7825d9e3e0268786a01556a5db4fb

data/bin/glynn

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'jekyll'
 require 'glynn'
+require 'io/console'
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 
@@ -19,16 +20,22 @@ case ARGV.size
     options['ftp_username'] = ARGV[2]
     options['ftp_password'] = ARGV[3]
 end
-options  = Jekyll.configuration(options)
-ftp_port = (options['ftp_port'] || 21).to_i
-passive  = options['ftp_passive'] || true
+options    = Jekyll.configuration(options)
+ftp_port   = (options['ftp_port'] || 21).to_i
+passive    = options['ftp_passive'] || true
+ftp_secure = options['ftp_secure'] || false
+
+# If _glynn.yml exists, load and merge these options
+if File.file?('_glynn.yml')
+  options = options.merge(YAML.load_file('_glynn.yml'))
+end
 
 puts "Building site: #{options['source']} -> #{options['destination']}"
 jekyll = Glynn::Jekyll.new
 jekyll.build
 puts "Successfully generated site"
 
-puts "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port})"
+puts "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port}, ftps: #{ftp_secure})"
 begin
   if options['ftp_username'].nil?
     print "FTP Username: "
@@ -39,10 +46,8 @@ begin
 
   if options['ftp_password'].nil?
     print "FTP Password: "
-    # We hide the entered characters before to ask for the password
-    system "stty -echo"
-    password = $stdin.gets.chomp
-    system "stty echo"
+    # Get the password without echoing characters
+    password = $stdin.noecho(&:gets).chomp
   else
     password = options['ftp_password']
   end
@@ -53,7 +58,12 @@ rescue NoMethodError, Interrupt
   exit
 end
 
-ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {:username => username, :password => password, :passive => passive})
+ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {
+  :username => username,
+  :password => password,
+  :passive  => passive,
+  :secure   => ftp_secure
+})
 puts "\r\nConnected to server. Sending site"
 ftp.sync(options['destination'], options['ftp_dir'])
 puts "Successfully sent site"

data/lib/glynn/ftp.rb

@@ -1,14 +1,15 @@
 require 'net/ftp'
+require 'double_bag_ftps'
 
 module Glynn
   class Ftp
-    attr_reader :host, :port, :username, :password, :passive
+    attr_reader :host, :port, :username, :password, :passive, :secure
 
     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]
+      @passive, @secure = options[:passive], options[:secure]
     end
 
     def sync(local, distant)
@@ -19,7 +20,7 @@ module Glynn
 
     private
     def connect
-      Net::FTP.open(host) do |ftp|
+      ftp_klass.open(host) do |ftp|
         ftp.passive = @passive
         ftp.connect(host, port)
         ftp.login(username, password)
@@ -27,6 +28,14 @@ module Glynn
       end
     end
 
+    def ftp_klass
+      if secure
+        DoubleBagFTPS
+      else
+        Net::FTP
+      end
+    end
+
     def send_dir(ftp, local, distant)
       begin
         ftp.mkdir(distant)

data/lib/glynn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: double-bag-ftps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables:
@@ -85,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Deploy a jekyll weblog through ftp