glynn 1.0.5 → 1.0.6

data/README.md

@@ -1,7 +1,8 @@
 Glynn
 =====
 
-Glynn offers you a bin to easily send a jekyll powered blog to your host through FTP.
+Glynn offers you a bin to easily send a jekyll powered blog to your host through FTP.  
+[![Travis](http://travis-ci.org/dmathieu/glynn.png)](http://travis-ci.org/dmathieu/glynn)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/bin/glynn

@@ -52,7 +52,7 @@ rescue NoMethodError, Interrupt
   exit
 end
 
-ftp = Glynn::Ftp.new(options['ftp_host'], 21, {:username => username, :password => password})
+ftp = Glynn::Ftp.new(options['ftp_host'], options['ftp_port'] || 21, {:username => username, :password => password})
 puts "\r\nConnected to server. Sending site"
 ftp.sync(options['destination'], options['ftp_dir'])
 puts "Successfully sent site"

data/glynn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glynn}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-07-27}
   s.default_executable = %q{glynn}
   s.description = %q{Deploy a jekyll weblog through ftp}
   s.email = %q{42@dmathieu.com}
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dmathieu/glynn}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Deploy a jekyll weblog through ftp}
   s.test_files = [
     "spec/lib/file_spec.rb",

data/lib/glynn/file.rb

@@ -1,8 +1,8 @@
 module Glynn
   class File
-    
+
     def self.is_bin?(f)
       %x(file #{f}) !~ /text/
     end
   end
-end
+end

data/lib/glynn/ftp.rb

@@ -3,26 +3,26 @@ require 'net/ftp'
 module Glynn
   class Ftp
     attr_reader :host, :port, :username, :password
-    
+
     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]
     end
-    
+
     def sync(local, distant)
       connect do |ftp|
         send_dir(ftp, local, distant)
       end
     end
-    
+
     private
     def connect
       ftp = Net::FTP.new(host, username, password)
       yield ftp
       ftp.close
     end
-    
+
     def send_dir(ftp, local, distant)
       begin
         ftp.mkdir(distant)
@@ -33,7 +33,7 @@ module Glynn
       Dir.foreach(local) do |file_name|
         # 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?
           # It is a directory, we recursively send it
           begin
@@ -52,7 +52,7 @@ module Glynn
            end
         end
       end
-      
+
     end
   end
 end

data/lib/glynn/jekyll.rb

@@ -3,11 +3,11 @@ require 'jekyll'
 module Glynn
   class Jekyll
     attr_reader :site
-    
+
     def initialize(options = {})
       @site = ::Jekyll::Site.new(::Jekyll.configuration(options))
     end
-    
+
     #
     # Builds the website in the ./_site directory.
     #

data/spec/lib/file_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe "File module" do
   before(:all) do
     FakeFS.activate!
@@ -7,14 +7,14 @@ describe "File module" do
   after(:all) do
     FakeFS.deactivate!
   end
-  
+
   it "should return file is text" do
     File.open('/test/README', 'w') { |f| f.write 'N/A' }
     Glynn::File.is_bin?('/test/README').should eql(true)
   end
-  
+
   it "should return file is binary" do
     File.open('/test/README', 'w') { |f| f.write ['0', '1', '2', '3'].pack('A3A3A3') }
     Glynn::File.is_bin?('/test/README').should eql(true)
   end
-end
+end

data/spec/lib/ftp_spec.rb

@@ -1,63 +1,63 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe "FTP Interface" do
   before(:each) do
     # We mock the FTP server
-    @mock = mock('Ftp server', :null_object => true)
-    
+    @mock = mock('Ftp server').as_null_object
+
     # And the puttextfile method
     class Net::FTP
       def puttextfile; true; end
     end
   end
-  
+
   it 'should login to ftp server' do
     @mock.should_receive(:close)
     Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)
-    
-    
+
+
     Glynn::Ftp.new('localhost').send(:connect) do |ftp|
       ftp.should eql(@mock)
     end
   end
-  
+
   it 'should accept a username and password' do
     @mock.should_receive(:close)
     Net::FTP.should_receive(:new).with('localhost', 'username', 'password').and_return(@mock)
-    
+
     Glynn::Ftp.new('localhost', 21, {:username => 'username', :password => 'password'}).send(:connect) do |ftp|
       ftp.should eql(@mock)
     end
   end
-  
+
   it 'should recursively send a directory' do
     # We expect NET/FTP to create every file
     @mock.should_receive(:putbinaryfile).with('/test/README', '/blah/README').and_return(true)
     @mock.should_receive(:putbinaryfile).with('/test/subdir/README', '/blah/subdir/README').and_return(true)
     @mock.should_receive(:mkdir).with('/blah')
     @mock.should_receive(:mkdir).with('/blah/subdir').twice
-    
+
     FakeFS do
       # We create the fake files and directories
       Dir.mkdir('/test') unless File.exists?('/test')
       Dir.mkdir('/test/subdir') unless File.exists?('/test')
       File.open('/test/README', 'w') { |f| f.write 'N/A' }
       File.open('/test/subdir/README', 'w') { |f| f.write 'N/A' }
-      
+
       # And send them
       Glynn::Ftp.new('localhost').send(:send_dir, @mock, '/test', '/blah')
     end
   end
-  
+
   it 'should connect itself to the server and send the local file to distant directory' do
     @mock.should_receive(:close)
-    
+
     FakeFS do
       interface = Glynn::Ftp.new('localhost')
       Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)
       interface.should_receive(:send_dir).with(@mock, '/test', '/blah')
-      
+
       interface.sync '/test', '/blah'
     end
   end
-end
+end

data/spec/lib/jekyll_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe "Relation between glynn and jekyll" do
   before(:all) do
     FakeFS.activate!
@@ -8,21 +8,21 @@ describe "Relation between glynn and jekyll" do
   after(:all) do
     FakeFS.deactivate!
   end
-  
+
   it 'should create a new website' do
     jekyll = Glynn::Jekyll.new({ 'source' => '/' })
     jekyll.build
   end
-  
+
   it 'should accept the ftp host option' do
     File.open('/_config.yml', 'w') { |f| f.write 'ftp_host: example.com' }
     options = Jekyll.configuration({'source' => '/'})
     options['ftp_host'].should eql('example.com')
   end
-  
+
   it 'should accept the fto dir option' do
     File.open('/_config.yml', 'w') { |f| f.write 'ftp_dir: /home/glynn' }
     options = Jekyll.configuration({'source' => '/'})
     options['ftp_dir'].should eql('/home/glynn')
   end
-end
+end

data/spec/spec_helper.rb

@@ -5,8 +5,3 @@ require 'fakefs/safe'
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'glynn'
-
-RSpec.configure do |config|
-  
-  
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-08 00:00:00.000000000 +02:00
+date: 2011-07-27 00:00:00.000000000 +02:00
 default_executable: glynn
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152256340 !ruby/object:Gem::Requirement
+  requirement: &2158401740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152256340
+  version_requirements: *2158401740
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &2152255280 !ruby/object:Gem::Requirement
+  requirement: &2158409380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152255280
+  version_requirements: *2158409380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152254220 !ruby/object:Gem::Requirement
+  requirement: &2158410880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152254220
+  version_requirements: *2158410880
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2152253200 !ruby/object:Gem::Requirement
+  requirement: &2158412480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152253200
+  version_requirements: *2158412480
 - !ruby/object:Gem::Dependency
   name: sdoc-helpers
-  requirement: &2152251760 !ruby/object:Gem::Requirement
+  requirement: &2158414160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152251760
+  version_requirements: *2158414160
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &2152250920 !ruby/object:Gem::Requirement
+  requirement: &2158415880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152250920
+  version_requirements: *2158415880
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables:
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1900938787396399437
+      hash: -4347291183296770297
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Deploy a jekyll weblog through ftp