glynn 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/glynn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "glynn"
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien MATHIEU"]
-  s.date = "2011-09-29"
+  s.date = "2012-01-31"
   s.description = "Deploy a jekyll weblog through ftp"
   s.email = "42@dmathieu.com"
   s.executables = ["glynn"]

data/lib/glynn/ftp.rb

@@ -18,9 +18,11 @@ module Glynn
 
     private
     def connect
-      ftp = Net::FTP.new(host_with_port, username, password)
-      yield ftp
-      ftp.close
+      Net::FTP.open(host) do |ftp|
+        ftp.connect(host, port)
+        ftp.login(username, password)
+        yield ftp
+      end
     end
 
     def send_dir(ftp, local, distant)

data/spec/lib/ftp_spec.rb

@@ -11,30 +11,36 @@ describe "FTP Interface" do
     end
   end
 
-  it 'should login to ftp server' do
-    @mock.should_receive(:close)
-    Net::FTP.should_receive(:new).with('localhost:21', nil, nil).and_return(@mock)
-
+  it 'should connect to ftp server' do
+    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
 
     Glynn::Ftp.new('localhost').send(:connect) do |ftp|
       ftp.should eql(@mock)
     end
   end
 
+  it 'should login to ftp server' do
+    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
+
+    Glynn::Ftp.new('localhost').send(:connect) do |ftp|
+      @mock.should_receive(:login).with(nil, nil)
+    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)
+    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
 
     Glynn::Ftp.new('localhost', 1234).send(:connect) do |ftp|
+      @mock.should_receive(:connect).with('localhost', 1234)
       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:21', 'username', 'password').and_return(@mock)
+    Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
 
     Glynn::Ftp.new('localhost', 21, {:username => 'username', :password => 'password'}).send(:connect) do |ftp|
+      @mock.should_receive(:login).with('username', 'password')
       ftp.should eql(@mock)
     end
   end
@@ -59,12 +65,13 @@ describe "FTP Interface" do
   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:21', nil, nil).and_return(@mock)
-      interface.should_receive(:send_dir).with(@mock, '/test', '/blah')
+      Net::FTP.should_receive(:open).with('localhost').and_return(@mock)
+      interface = Glynn::Ftp.new('localhost') do |ftp|
+        @mock.should_receive(:connect).with('localhost', 21)
+        @mock.should_receive(:login).with(nil, nil)
+        interface.should_receive(:send_dir).with(@mock, '/test', '/blah')
+      end
 
       interface.sync '/test', '/blah'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glynn
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70131593457960 !ruby/object:Gem::Requirement
+  requirement: &70171743230860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131593457960
+  version_requirements: *70171743230860
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70131593457300 !ruby/object:Gem::Requirement
+  requirement: &70171743230160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131593457300
+  version_requirements: *70171743230160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70131593456520 !ruby/object:Gem::Requirement
+  requirement: &70171743229540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131593456520
+  version_requirements: *70171743229540
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70131593455820 !ruby/object:Gem::Requirement
+  requirement: &70171743228960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131593455820
+  version_requirements: *70171743228960
 - !ruby/object:Gem::Dependency
   name: sdoc-helpers
-  requirement: &70131593455180 !ruby/object:Gem::Requirement
+  requirement: &70171743228320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131593455180
+  version_requirements: *70171743228320
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70131593454560 !ruby/object:Gem::Requirement
+  requirement: &70171743227780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70131593454560
+  version_requirements: *70171743227780
 description: Deploy a jekyll weblog through ftp
 email: 42@dmathieu.com
 executables:
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3204594906216525315
+      hash: 3112693191030928112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: