glynn 1.0.0 → 1.0.1

data/.gitignore

@@ -2,4 +2,6 @@ _site/*
 pkg/*
 *.kpf
 *.tmproj
-.DS_Store
+.DS_Store
+vendor/gems/*
+bin/*

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'vendor/gems/environment'
 require 'spec/rake/spectask'
 
 begin
@@ -10,7 +10,7 @@ begin
     gemspec.email = "42@dmathieu.com"
     gemspec.homepage = "http://github.com/dmathieu/glynn"
     gemspec.authors = ["Damien MATHIEU"]
-    gemspec.version = '1.0.0'
+    gemspec.version = '1.0.1'
     
     gemspec.add_dependency('jekyll', '>= 0.5.4')
   end

data/bin/glynn

@@ -24,14 +24,22 @@ puts "Successfully generated site"
 
 puts "Sending site over FTP (host: #{options['ftp_host']})"
 begin
-  print "FTP Username: "
-  username = $stdin.gets.chomp
+  if options['ftp_username'].nil?
+    print "FTP Username: "
+    username = $stdin.gets.chomp
+  else
+    username = options['username']
+  end
   
-  print "FTP Password: "
-  # We hide the entered characters before to ask for the password
-  system "stty -echo"
-  password = $stdin.gets.chomp
-  system "stty echo"
+  if options['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"
+  else
+    password = options['password']
+  end
 rescue NoMethodError, Interrupt
   # When the process is exited, we display the characters again
   # And we exit

data/glynn.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glynn}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]

data/lib/glynn/ftp.rb

@@ -34,7 +34,7 @@ module Glynn
         # If the file/directory is hidden (first character is a dot), we ignore it
         next if file_name =~ /^\./
         
-        if File.stat(local + "/" + file_name).directory?
+        if ::File.stat(local + "/" + file_name).directory?
           # It is a directory, we recursively send it
           begin
             ftp.mkdir(distant + "/" + file_name)
@@ -45,7 +45,11 @@ module Glynn
           send_dir(ftp, local + "/" + file_name, distant + "/" + file_name)
         else
            # It's a file, we just send it
-           ftp.puttextfile(local + "/" + file_name, distant + "/" + file_name)
+           if Glynn::File.is_bin?(local + "/" + file_name)
+             ftp.putbinaryfile(local + "/" + file_name, distant + "/" + file_name)
+           else
+             ftp.puttextfile(local + "/" + file_name, distant + "/" + file_name)
+           end
         end
       end
       

data/lib/glynn.rb

@@ -2,4 +2,5 @@ $:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
 require 'rubygems'
 
 require 'glynn/jekyll'
+require 'glynn/file'
 require 'glynn/ftp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: glynn
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Damien MATHIEU
@@ -45,10 +45,8 @@ files:
 - spec/lib/jekyll.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/dmathieu/glynn
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -69,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 3
 summary: Deploy a jekyll weblog through ftp