chake 0.10 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77ef7f899b9ce537667051750f06a7477a0fa79
-  data.tar.gz: 6a34e5a9df879a762fc76de59ee1b0d931813c03
+  metadata.gz: a6c0ada57c6acd1ba0a23069a528397144d0e61c
+  data.tar.gz: 030adffa33315100225ab10a63a7038e9f6fd512
 SHA512:
-  metadata.gz: 55237a960ac4ae67d3f0f173582b615b8306767ed16bda793828170965472356da69749b3597260e9be61ba29dd1072dd61c015fcba33e6ebc66585c7a565313
-  data.tar.gz: 2fcf4ef7b8edb50beb1c18b87bd5e03c30dded4477ef4e1cf3e8ac53d52454497afe3b91a17692d78cd379b37670f2688ac854ac5879b7b979b0d7190ef57a42
+  metadata.gz: 866152de25dbedae6edc9b3ad993b425a468c04dfaf9e8fa13bb2ba597128801fbdc46f33ea101919dd02ea2e99a4de98e9c663ae72a12cfe84780ee7b527eac
+  data.tar.gz: 608ccff3b9143a48bb16ca44f9746964f10481389e42cc91cf566889d2fdf224956a0f164b73d6515a7c7d9fb09fee8ef7488f7d2ef50aaec7666687e41e3a88

data/ChangeLog.md

@@ -1,3 +1,8 @@
+# 0.10.1
+
+* actually implement support for custom ports in Node URL's. Despite being
+  documented, that didn't actually work until now.
+
 # 0.10
 
 * Add hook functionality. See README/manpage for documentation.

data/Rakefile

@@ -48,42 +48,6 @@ end
 
 task 'build:all' => ['build:debsrc', 'build:rpmsrc']
 
-task :obs => 'build:all' do
-  if !File.exist?('tmp/obs/home:terceiro:chake/chake')
-    mkdir_p 'tmp/obs'
-    chdir 'tmp/obs' do
-      sh 'osc', 'checkout', 'home:terceiro:chake', 'chake'
-    end
-  end
-
-  # remove old files
-  chdir 'tmp/obs/home:terceiro:chake/chake' do
-    Dir.glob('*').each do |f|
-      sh 'osc', 'remove', '--force', f
-    end
-  end
-
-  # copy over new files
-  [
-    "pkg/#{pkg.name}-#{pkg.version}.tar.gz",
-    "pkg/#{pkg.name}.spec",
-    "pkg/#{pkg.name}_#{pkg.version}.orig.tar.gz",
-    "pkg/#{pkg.name}_#{pkg.version}-1.debian.tar.xz",
-    "pkg/#{pkg.name}_#{pkg.version}-1.dsc",
-  ].each do |f|
-    sh 'cp', '--dereference', f, 'tmp/obs/home:terceiro:chake/chake'
-  end
-
-  # push new files to the repository
-  chdir 'tmp/obs/home:terceiro:chake/chake' do
-    Dir.glob('*').each do |f|
-      sh 'osc', 'add', f
-    end
-    sh 'osc', 'commit', '--message', "#{pkg.name}, version #{pkg.version}"
-  end
-
-end
-
 desc 'lists changes since last release'
 task :changelog do
   last_tag = `git tag | sort -V`.split.last
@@ -108,6 +72,6 @@ task :check_changelog do
 end
 
 desc 'Makes a release'
-task :release => [:check_tag, :check_changelog, :test, 'bundler:release', :obs]
+task :release => [:check_tag, :check_changelog, :test, 'bundler:release']
 
 task :default => :test

data/lib/chake/backend/ssh.rb

@@ -5,7 +5,7 @@ module Chake
     class Ssh < Backend
 
       def scp
-        ['scp', ssh_config].flatten.compact
+        ['scp', ssh_config, scp_options].flatten.compact
       end
 
       def scp_dest
@@ -21,7 +21,7 @@ module Chake
       end
 
       def command_runner
-        [ssh_prefix, 'ssh', ssh_config, ssh_target].flatten.compact
+        [ssh_prefix, 'ssh', ssh_config, ssh_options, ssh_target].flatten.compact
       end
 
       def shell_command
@@ -31,7 +31,21 @@ module Chake
       private
 
       def rsync_ssh
-        File.exist?(ssh_config_file) && ['-e', 'ssh -F ' + ssh_config_file ] || []
+        @rsync_ssh ||=
+          begin
+            ssh_command = 'ssh'
+            if File.exist?(ssh_config_file)
+              ssh_command +=  ' -F ' + ssh_config_file
+            end
+            if node.port
+              ssh_command += ' -p ' + node.port.to_s
+            end
+            if ssh_command == 'ssh'
+              []
+            else
+              ['-e', ssh_command]
+            end
+          end
       end
 
       def ssh_config
@@ -50,6 +64,14 @@ module Chake
         [node.remote_username, node.hostname].compact.join('@')
       end
 
+      def ssh_options
+        node.port && ['-p', node.port.to_s] || []
+      end
+
+      def scp_options
+        node.port && ['-P', node.port.to_s] || []
+      end
+
     end
 
   end

data/lib/chake/node.rb

@@ -11,6 +11,7 @@ module Chake
     extend Forwardable
 
     attr_reader :hostname
+    attr_reader :port
     attr_reader :username
     attr_reader :remote_username
     attr_reader :path
@@ -25,16 +26,17 @@ module Chake
 
     def initialize(hostname, data = {})
       uri = URI.parse(hostname)
-      if !uri.scheme && !uri.host && uri.path
+      if !uri.host && ((!uri.scheme && uri.path) || (uri.scheme && uri.opaque))
         uri = URI.parse("ssh://#{hostname}")
       end
-      if uri.path.empty?
+      if uri.path && uri.path.empty?
         uri.path = nil
       end
 
       @backend_name = uri.scheme
 
       @hostname = uri.host
+      @port = uri.port
       @username = uri.user || Etc.getpwuid.name
       @remote_username = uri.user
       @path = uri.path || "/var/tmp/chef.#{username}"

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.10"
+  VERSION = "0.10.1"
 end

data/spec/chake/backend/ssh_spec.rb

@@ -21,4 +21,17 @@ describe Chake::Backend::Ssh do
     expect(node.remote_username).to eq('myuser')
   end
 
+  context 'with a custom port' do
+    let(:node) { Chake::Node.new('ssh://myhost:2222') }
+    it 'uses port with ssh' do
+      expect(backend.command_runner).to eq(['ssh', '-p', '2222', 'myhost'])
+    end
+    it 'uses port with scp' do
+      expect(backend.scp).to eq(['scp', '-P', '2222'])
+    end
+    it 'uses port with rsync' do
+      expect(backend.send(:rsync_ssh)).to eq(['-e', 'ssh -p 2222'])
+    end
+  end
+
 end

data/spec/chake/node_spec.rb

@@ -34,6 +34,17 @@ describe Chake::Node do
     expect(with_data.data).to be_a(Hash)
   end
 
+  let(:with_port) { Chake::Node.new('ssh://foo.bar.com:2222') }
+  it('accepts a port specification') do
+    expect(with_port.port).to eq(2222)
+  end
+
+  let(:with_port_but_no_scheme) { Chake::Node.new('foo.bar.com:2222') }
+  it('accepts a port specification without a scheme') do
+    expect(with_port_but_no_scheme.port).to eq(2222)
+    expect(with_port_but_no_scheme.backend.to_s).to eq('ssh')
+  end
+
   [:run, :run_as_root, :rsync_dest].each do |method|
     it("delegates #{method} to backend") do
       node = simple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: 0.10.1
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler