euromail 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681fed0406570f2d0611fbc0cec27e340f8fdbf4
-  data.tar.gz: 889b36e9dff7dc703072f7e74fe1c59f8219d328
+  metadata.gz: 7310e9a1f83998fbb895d06f34dd0ec9292fdd7a
+  data.tar.gz: 462798a9e3ac58a3d2d56f8a74317e78e5ae0762
 SHA512:
-  metadata.gz: 7aa8eed727a2ba83c434bd27cfe2c1c966e1643ab16669c9326eed539a367fdb38031af1a2c95443d024e60d8b57a6e7ee67118b056f016b531308efbf40840e
-  data.tar.gz: 3e5442d4d27aaf9c91d2dde95686bb521a052c6171b1c181554b6366996845001547f05424247accae4d3d32e8dd02e6c13aa71735848ec2693a200006bea615
+  metadata.gz: 5feb196cfd433982b982c30e2ea38b87b083f917265f19b1f836e1a7e8dffd67f0da531ac27b2c4d2e62a8f5512be65ab0c0ee9203f1130228caa79992bb93f1
+  data.tar.gz: b3b8d8591ae0699fb0b24a45b9bb6f598712d7c1967c71b311c3f1e6f57dd25761775ba822bc3a4ec4fa2918fdb551de5f42152b96374aca7761c094b72509d6

data/lib/euromail/sftp_service.rb

@@ -5,12 +5,13 @@ module Euromail
 
     attr_reader :application, :customer, :host, :username, :password, :current_mode
 
-    def initialize application, customer, host, username, password
+    def initialize application, customer, host, username, password, net_ssh_options={}
       @application = application
       @customer = customer
       @host = host
       @username = username
       @password = password
+      @net_ssh_options = net_ssh_options
       @current_mode = :production
     end
 
@@ -37,7 +38,7 @@ module Euromail
       end
     end
 
-    # Attempt to remove the file for the given identifier. 
+    # Attempt to remove the file for the given identifier.
     def remove! identifier
       connect do |connection|
         connection.remove( identifier )
@@ -51,7 +52,8 @@ module Euromail
     #   connection.remove('3')
     # end
     def connect &block
-      Net::SFTP.start(host, username, :password => password) do |sftp|
+      options = {password: password }.merge(@net_ssh_options)
+      Net::SFTP.start(host, username, options) do |sftp|
         connection = Euromail::SFTPConnection.new(self, sftp)
         block.call(connection)
       end
@@ -65,4 +67,4 @@ module Euromail
     end
 
   end
-end
+end

data/spec/euromail/sftp_connection_spec.rb

@@ -13,7 +13,7 @@ describe Euromail::SFTPConnection do
 
   describe "#upload" do
     it "use the generated filename" do
-      @net_sftp_session.should receive(:upload!).with( @string_io, euromail.filename('1') )
+      expect(@net_sftp_session).to receive(:upload!).with( @string_io, euromail.filename('1') )
       euromail.connect do |connection|
         connection.upload('some-client-code', '1')
       end
@@ -29,8 +29,8 @@ describe Euromail::SFTPConnection do
 
     it "can upload several pdf files within the same connection" do
       expect(@net_sftp_session).to receive(:upload!).exactly(2).times
-      StringIO.should receive(:new).with('some-client-code-1')
-      StringIO.should receive(:new).with('some-client-code-2')
+      expect(StringIO).to receive(:new).with('some-client-code-1')
+      expect(StringIO).to receive(:new).with('some-client-code-2')
 
       euromail.connect do |connection|
         connection.upload("some-client-code-1", '1')
@@ -41,7 +41,7 @@ describe Euromail::SFTPConnection do
 
   describe "#remove" do
     it "removes the file with the generated filename" do
-      @net_sftp_session.should receive(:remove!).with( euromail.filename('1') )
+      expect(@net_sftp_session).to receive(:remove!).with( euromail.filename('1') )
       euromail.connect do |connection|
         connection.remove('1')
       end

data/spec/euromail/sftp_development_spec.rb

@@ -17,19 +17,23 @@ describe Euromail::SFTPService do
     end
 
     it "the current mode is development" do
-      euromail.current_mode.should eql :development
+      expect(euromail.current_mode).to eql :development
     end
 
     describe "#upload" do
       it "does not upload anything" do
-        @file_hander.should_not receive(:write)
+        expect(@file_hander).not_to receive(:write)
+        allow($stdout).to receive(:puts)
+        euromail.connect do |connection|
+          connection.upload('come-client-code', '3')
+        end
       end
 
       it "logs uploads" do
-        Net::SFTP.should_not receive(:start)
-        $stdout.should receive(:puts).with("Connecting to some-cheapass-domain.com")
-        $stdout.should receive(:puts).with("Uploaded ./moves_nedap_3.pdf")
-        $stdout.should receive(:puts).with("Connection to some-cheapass-domain.com closed")
+        expect(Net::SFTP).not_to receive(:start)
+        expect($stdout).to receive(:puts).with("Connecting to some-cheapass-domain.com")
+        expect($stdout).to receive(:puts).with("Uploaded ./moves_nedap_3.pdf")
+        expect($stdout).to receive(:puts).with("Connection to some-cheapass-domain.com closed")
         euromail.connect do |connection|
           connection.upload('come-client-code', '3')
         end
@@ -38,14 +42,18 @@ describe Euromail::SFTPService do
 
     describe "#remove" do
       it "does not remove anything" do
-        @net_sftp_session.should_not receive(:remove!)
+        expect(@net_sftp_session).not_to receive(:remove!)
+        allow($stdout).to receive(:puts)
+        euromail.connect do |connection|
+          connection.remove('3')
+        end
       end
 
       it "logs deletes" do
-        Net::SFTP.should_not receive(:start)
-        $stdout.should receive(:puts).with("Connecting to some-cheapass-domain.com")
-        $stdout.should receive(:puts).with("Removed ./moves_nedap_3.pdf")
-        $stdout.should receive(:puts).with("Connection to some-cheapass-domain.com closed")
+        expect(Net::SFTP).not_to receive(:start)
+        expect($stdout).to receive(:puts).with("Connecting to some-cheapass-domain.com")
+        expect($stdout).to receive(:puts).with("Removed ./moves_nedap_3.pdf")
+        expect($stdout).to receive(:puts).with("Connection to some-cheapass-domain.com closed")
         euromail.connect do |connection|
           connection.remove('3')
         end
@@ -54,9 +62,9 @@ describe Euromail::SFTPService do
 
     describe "#connect" do
       it "logs the connection" do
-        Net::SFTP.should_not receive(:start)
-        $stdout.should receive(:puts).with("Connecting to some-cheapass-domain.com")
-        $stdout.should receive(:puts).with("Connection to some-cheapass-domain.com closed")
+        expect(Net::SFTP).not_to receive(:start)
+        expect($stdout).to receive(:puts).with("Connecting to some-cheapass-domain.com")
+        expect($stdout).to receive(:puts).with("Connection to some-cheapass-domain.com closed")
         euromail.connect {}
       end
     end

data/spec/euromail/sftp_service_spec.rb

@@ -11,71 +11,82 @@ describe Euromail::SFTPService do
     Euromail::SFTPService.new('moves', 'nedap', 'some-cheapass-domain.com', "stefan", "super_secret")
   end
 
+  let(:euromail_with_option) do
+    Euromail::SFTPService.new('moves', 'nedap', 'some-cheapass-domain.com', "stefan", "super_secret", {
+        some_option: "test option"
+    })
+  end
+
   context "when creating" do
     it "has an application, customer, host, username and password" do
-      euromail.application.should eql('moves')
-      euromail.customer.should eql('nedap')
-      euromail.host.should eql('some-cheapass-domain.com')
-      euromail.username.should eql('stefan')
-      euromail.password.should eql('super_secret')
+      expect(euromail.application).to eql('moves')
+      expect(euromail.customer).to eql('nedap')
+      expect(euromail.host).to eql('some-cheapass-domain.com')
+      expect(euromail.username).to eql('stefan')
+      expect(euromail.password).to eql('super_secret')
     end
 
     it "the current mode is production" do
-      euromail.current_mode.should eql :production
+      expect(euromail.current_mode).to eql :production
     end
   end
 
   describe "#connect" do
     it "connects to euromail using the given username and pass" do
-      Net::SFTP.should receive(:start).with('some-cheapass-domain.com', 'stefan', :password => 'super_secret')
+      expect(Net::SFTP).to receive(:start).with('some-cheapass-domain.com', 'stefan', :password => 'super_secret')
       euromail.connect {}
     end
+
+    it "connects using additional net_ssh options passed from the user" do
+      expect(Net::SFTP).to receive(:start).with('some-cheapass-domain.com', 'stefan', :password => 'super_secret', :some_option => "test option")
+      euromail_with_option.connect {}
+    end
   end
 
   describe "#upload!" do
     it "uploads pdf data" do
-      StringIO.should receive(:new).with('some-client-code')
-      @net_sftp_session.should receive(:upload!).with(@string_io, euromail.filename('1'))
+      expect(StringIO).to receive(:new).with('some-client-code')
+      expect(@net_sftp_session).to receive(:upload!).with(@string_io, euromail.filename('1'))
       euromail.upload!('some-client-code', '1')
     end
 
     it "does not remove the remote file after an upload succeeds" do
-      euromail.should_not receive(:remove!).with('1')
+      expect(euromail).not_to receive(:remove!).with('1')
       euromail.upload!('some-client-code', '1')
     end
 
     it "tries to remove the remote file after an upload fails" do
-      @net_sftp_session.stub(:upload!).and_raise("Connection dropped")
-      euromail.should receive(:remove!).with('1')
-      expect{ euromail.upload!('some-client-code', '1') }.to raise_error
+      expect(@net_sftp_session).to receive(:upload!).and_raise("Connection dropped")
+      expect(euromail).to receive(:remove!).with('1')
+      expect{ euromail.upload!('some-client-code', '1') }.to raise_error("Connection dropped")
     end
 
     it "raises if some error occurs" do
-      @net_sftp_session.stub(:upload!).and_raise("Some error")
-      expect{ euromail.upload!('some-client-code', '2') }.to raise_error
+      expect(@net_sftp_session).to receive(:upload!).and_raise("Some error")
+      expect{ euromail.upload!('some-client-code', '2') }.to raise_error("Some error")
     end
   end
 
   describe "#remove!" do
     it "removes the file from the sftp server" do
-      @net_sftp_session.should receive(:remove!).with( euromail.filename('2') )
+      expect(@net_sftp_session).to receive(:remove!).with( euromail.filename('2') )
       euromail.remove!('2')
     end
 
     it "raises if some error occurs" do
-      @net_sftp_session.stub(:remove!).and_raise("Some error")
-      expect{ euromail.remove!('2') }.to raise_error
+      expect(@net_sftp_session).to receive(:remove!).and_raise("Some error")
+      expect{ euromail.remove!('2') }.to raise_error("Some error")
     end
   end
 
   describe "#filename" do 
     it "generates a string with application, customer and the given identifier" do
-      euromail.filename('123').should eql('./moves_nedap_123.pdf')
+      expect(euromail.filename('123')).to eql('./moves_nedap_123.pdf')
     end
 
     it "requires a non empty identifier" do
-      expect{ euromail.filename('') }.to raise_error
-      expect{ euromail.filename(nil) }.to raise_error
+      expect{ euromail.filename('') }.to raise_error("An identifier is required")
+      expect{ euromail.filename(nil) }.to raise_error("An identifier is required")
     end
   end
 

data/spec/euromail/sftp_test_spec.rb

@@ -17,37 +17,39 @@ describe Euromail::SFTPService do
     end
 
     it "the current mode is test" do
-      euromail.current_mode.should eql :test
+      expect(euromail.current_mode).to eql :test
     end
 
     describe "#upload" do
       it "does not upload anything" do
-        @file_hander.should_not receive(:write)
+        expect(@file_hander).not_to receive(:write)
+        euromail.upload!('some-client-code', '1')
       end
       
       it "stores uploaded filenames" do
-        euromail.uploaded_files.should == []
+        expect(euromail.uploaded_files).to eql([])
         euromail.upload!('some-client-code', '1')
-        euromail.uploaded_files.should == [euromail.filename('1')]
+        expect(euromail.uploaded_files).to eql([euromail.filename('1')])
       end
     end
 
     describe "#remove" do
       it "does not remove anything" do
-        @net_sftp_session.should_not receive(:remove!)
+        expect(@net_sftp_session).not_to receive(:remove!)
+        euromail.remove!('2')
       end
 
       it "stores deleted filenames" do
-        euromail.removed_files.should == []
+        expect(euromail.removed_files).to eql([])
         euromail.remove!('2')
-        euromail.removed_files.should == [euromail.filename('2')]
+        expect(euromail.removed_files).to eql([euromail.filename('2')])
       end
     end
 
     describe "#connect" do
       it "only calls the block" do
-        Net::SFTP.should_not receive(:start)
-        $stdout.should_not receive(:puts)
+        expect(Net::SFTP).not_to receive(:start)
+        expect($stdout).not_to receive(:puts)
         euromail.connect {}
       end
     end

data/spec/sftp_mock.rb

@@ -3,18 +3,13 @@ module SFTPMock
     @net_sftp_session = double("Net::SFTP::Session")
     @string_io = double("StringIO")
 
-    @file_hander.stub(:write) do |data|
-    end
-
-    @net_sftp_session.stub(:remove!) do |filename|
-    end
-
-    @net_sftp_session.stub(:upload!) do |filename|
-    end
-
-    StringIO.stub(:new).and_return(@string_io)
+    RSpec::Mocks.configuration.allow_message_expectations_on_nil
+    allow(@file_hander).to receive(:write)
+    allow(@net_sftp_session).to receive(:remove!)
+    allow(@net_sftp_session).to receive(:upload!)
+    allow(StringIO).to receive(:new).and_return(@string_io)
 
-    Net::SFTP.stub(:start) do |host, username, password_hash, &block|
+    allow(Net::SFTP).to receive(:start) do |host, username, password_hash, &block|
       block.call(@net_sftp_session) if block
     end
   end

data/spec/spec_helper.rb

@@ -10,3 +10,5 @@ if ENV["COVERAGE"]
     add_filter "/spec/"
   end
 end
+
+RSpec::Mocks.configuration.allow_message_expectations_on_nil = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: euromail
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Stefan Teijgeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Gem to upload pdf data to an SFTP server