glynn 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe3f3fa0c4de4001f14909dc1bdf2a0b342a8a6
-  data.tar.gz: c7e46abf98fb70885f861c3689c7cd965b5be2ea
+  metadata.gz: d3187c7199a57f5a3bb9327a331d650bc2e48b84
+  data.tar.gz: 6b45a7a682a883b089db39ae3a12ef80588c4412
 SHA512:
-  metadata.gz: 10c3b169b3852b37c81614848c768e3ab81dba823491e52c8dc6b0451f4677c76e4471a93ef5b89f99a7146943f1f7470cafb561769d2edddce916f876a79222
-  data.tar.gz: 77d4304c5fa8dce3d039395a7a4403039d25e8ae876b55e59ffb680f4c216c9911d3f37cb1edee06f047d7b040bbca83f83c0e75bead1d93872f7f8c37d76c24
+  metadata.gz: 765eb83f089e88906d531c02c47a5f96dd2cf8cc88467f71e0d0cd4a80c802efe0bc7f47333dea6cd383d193d323b69a015f4b093ce70cd580527cffccb4bb69
+  data.tar.gz: e78de1a3d63724e717699fb788acada85e6cd8a21cf051f0c3fad02da043f517b8dfd67735d4f3034bfab04e914384c1e80b214924e35134cae7e499eb58f268

data/bin/glynn

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'jekyll'
+require 'netrc'
 require 'glynn'
+require 'highline'
 require 'io/console'
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+netrc = Netrc.read
+cli = HighLine.new
 
 options = {}
 case ARGV.size
@@ -30,6 +34,18 @@ if File.file?('_glynn.yml')
   options = options.merge(YAML.load_file('_glynn.yml'))
 end
 
+# Include Username/Password from .netrc file if available
+if n = netrc[options['ftp_host']]
+  if options['ftp_username'] || options['ftp_password']
+    cli.say cli.color(
+      "The username and password settings from the configuration file" +
+      " take precedence over those in the netrc file!",
+      :yellow
+    )
+  end
+  options = (Hash[['ftp_username', 'ftp_password'].zip n]).merge options
+end
+
 puts "Building site: #{options['source']} -> #{options['destination']}"
 jekyll = Glynn::Jekyll.new
 jekyll.build
@@ -48,6 +64,10 @@ begin
     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']
   end

data/lib/glynn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables:
@@ -98,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Deploy a jekyll weblog through ftp
 test_files: []
-has_rdoc: