glynn 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3187c7199a57f5a3bb9327a331d650bc2e48b84
-  data.tar.gz: 6b45a7a682a883b089db39ae3a12ef80588c4412
+  metadata.gz: 40d3add92259243508f8487f677cf5eb367d1c2c
+  data.tar.gz: c0102f947af45c1d93fc30f182dea522b48b4233
 SHA512:
-  metadata.gz: 765eb83f089e88906d531c02c47a5f96dd2cf8cc88467f71e0d0cd4a80c802efe0bc7f47333dea6cd383d193d323b69a015f4b093ce70cd580527cffccb4bb69
-  data.tar.gz: e78de1a3d63724e717699fb788acada85e6cd8a21cf051f0c3fad02da043f517b8dfd67735d4f3034bfab04e914384c1e80b214924e35134cae7e499eb58f268
+  metadata.gz: ce0a531620c4ececdd165a87214707d057fa3c6914cb9719c59489b233a9c8556dc5214240825a6f52384958fe6962f3ebc3a64f62859ac39bd4db14038c06d8
+  data.tar.gz: 8fd4934e0d04b71ad1c62710db80354370fe712e3eef74f751d05273654f49303a6a1b1bc62ab113ca61bce25baa4daa319eb576d7d0bf681a3af916a0d33de2

data/bin/glynn

@@ -25,15 +25,15 @@ case ARGV.size
     options['ftp_password'] = ARGV[3]
 end
 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
 
+ftp_port   = (options['ftp_port'] || 21).to_i
+passive    = options['ftp_passive'] || true
+ftp_secure = options['ftp_secure'] || false
+
 # Include Username/Password from .netrc file if available
 if n = netrc[options['ftp_host']]
   if options['ftp_username'] || options['ftp_password']
@@ -46,36 +46,28 @@ if n = netrc[options['ftp_host']]
   options = (Hash[['ftp_username', 'ftp_password'].zip n]).merge options
 end
 
-puts "Building site: #{options['source']} -> #{options['destination']}"
+cli.say "Building site: #{options['source']} -> #{options['destination']}"
 jekyll = Glynn::Jekyll.new
 jekyll.build
-puts "Successfully generated site"
+cli.say cli.color("Successfully generated site", :green)
 
-puts "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port}, ftps: #{ftp_secure})"
-begin
-  if options['ftp_username'].nil?
-    print "FTP Username: "
-    username = $stdin.gets.chomp
-  else
-    username = options['ftp_username']
-  end
+cli.say "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port}, ftps: #{ftp_secure})"
+
+if options['ftp_username'].nil?
+  username = cli.ask "FTP Username: "
+else
+  username = options['ftp_username']
+end
 
-  if options['ftp_password'].nil?
-    print "FTP Password: "
-    # Get the password without echoing characters
-    password = $stdin.noecho(&:gets).chomp
-    if cli.agree("Would you like to save this password to #{Netrc.default_path}?")
-      netrc[options['ftp_host']] = username, password
-      netrc.save
-    end
-  else
-    password = options['ftp_password']
+if options['ftp_password'].nil?
+  # Get the password without echoing characters
+  password = cli.ask("FTP Password: ") { |q| q.echo = false }
+  if cli.agree("Would you like to save this password to #{Netrc.default_path}?")
+    netrc[options['ftp_host']] = username, password
+    netrc.save
   end
-rescue NoMethodError, Interrupt
-  # When the process is exited, we display the characters again
-  # And we exit
-  system "stty echo"
-  exit
+else
+  password = options['ftp_password']
 end
 
 ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {
@@ -84,6 +76,6 @@ ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {
   :passive  => passive,
   :secure   => ftp_secure
 })
-puts "\r\nConnected to server. Sending site"
+cli.say "Connected to server. Sending site"
 ftp.sync(options['destination'], options['ftp_dir'])
-puts "Successfully sent site"
+cli.say cli.color("Successfully sent site", :green)

data/lib/glynn/version.rb

@@ -1,3 +1,3 @@
 module Glynn
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,3 +131,4 @@ signing_key:
 specification_version: 4
 summary: Deploy a jekyll weblog through ftp
 test_files: []
+has_rdoc: