glynn 1.0.6 → 1.0.7

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/bin/glynn

@@ -20,14 +20,14 @@ case ARGV.size
     options['ftp_password'] = ARGV[3]
 end
 options = Jekyll.configuration(options)
-
+ftp_port = options['ftp_port'].to_i || 21
 
 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']})"
+puts "Sending site over FTP (host: #{options['ftp_host']}, port: #{ftp_port})"
 begin
   if options['ftp_username'].nil?
     print "FTP Username: "
@@ -35,7 +35,7 @@ begin
   else
     username = options['ftp_username']
   end
-  
+
   if options['ftp_password'].nil?
     print "FTP Password: "
     # We hide the entered characters before to ask for the password
@@ -52,7 +52,7 @@ rescue NoMethodError, Interrupt
   exit
 end
 
-ftp = Glynn::Ftp.new(options['ftp_host'], options['ftp_port'] || 21, {:username => username, :password => password})
+ftp = Glynn::Ftp.new(options['ftp_host'], ftp_port, {: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.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = %q{2011-07-27}
+  s.date = %q{2011-09-16}
   s.default_executable = %q{glynn}
   s.description = %q{Deploy a jekyll weblog through ftp}
   s.email = %q{42@dmathieu.com}

data/lib/glynn/ftp.rb

@@ -18,7 +18,7 @@ module Glynn
 
     private
     def connect
-      ftp = Net::FTP.new(host, username, password)
+      ftp = Net::FTP.new(host_with_port, username, password)
       yield ftp
       ftp.close
     end
@@ -52,7 +52,11 @@ module Glynn
            end
         end
       end
+    end
 
+    private
+    def host_with_port
+      "#{host}:#{port}"
     end
   end
 end

data/spec/lib/ftp_spec.rb

@@ -13,7 +13,7 @@ describe "FTP Interface" do
 
   it 'should login to ftp server' do
     @mock.should_receive(:close)
-    Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)
+    Net::FTP.should_receive(:new).with('localhost:21', nil, nil).and_return(@mock)
 
 
     Glynn::Ftp.new('localhost').send(:connect) do |ftp|
@@ -21,9 +21,18 @@ describe "FTP Interface" do
     end
   end
 
+  it 'should use the given port' do
+    @mock.should_receive(:close)
+    Net::FTP.should_receive(:new).with('localhost:1234', nil, nil).and_return(@mock)
+
+    Glynn::Ftp.new('localhost', 1234).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)
+    Net::FTP.should_receive(:new).with('localhost:21', 'username', 'password').and_return(@mock)
 
     Glynn::Ftp.new('localhost', 21, {:username => 'username', :password => 'password'}).send(:connect) do |ftp|
       ftp.should eql(@mock)
@@ -54,7 +63,7 @@ describe "FTP Interface" do
 
     FakeFS do
       interface = Glynn::Ftp.new('localhost')
-      Net::FTP.should_receive(:new).with('localhost', nil, nil).and_return(@mock)
+      Net::FTP.should_receive(:new).with('localhost:21', nil, nil).and_return(@mock)
       interface.should_receive(:send_dir).with(@mock, '/test', '/blah')
 
       interface.sync '/test', '/blah'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000 +02:00
+date: 2011-09-16 00:00:00.000000000 +02:00
 default_executable: glynn
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2158401740 !ruby/object:Gem::Requirement
+  requirement: &2154685660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158401740
+  version_requirements: *2154685660
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &2158409380 !ruby/object:Gem::Requirement
+  requirement: &2154705580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158409380
+  version_requirements: *2154705580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158410880 !ruby/object:Gem::Requirement
+  requirement: &2154707160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158410880
+  version_requirements: *2154707160
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2158412480 !ruby/object:Gem::Requirement
+  requirement: &2154708720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158412480
+  version_requirements: *2154708720
 - !ruby/object:Gem::Dependency
   name: sdoc-helpers
-  requirement: &2158414160 !ruby/object:Gem::Requirement
+  requirement: &2154710300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158414160
+  version_requirements: *2154710300
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &2158415880 !ruby/object:Gem::Requirement
+  requirement: &2154712120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158415880
+  version_requirements: *2154712120
 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: -4347291183296770297
+      hash: -1694366324833160504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: