chake 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7488361bba23f010e6873f567d922653ed2dcb3
-  data.tar.gz: e2166babc9c279160a4bd291418131d02fac9cfb
+  metadata.gz: 1df478d2c90d2ca124065d8f29ea659cceb973f7
+  data.tar.gz: c0c875fe667e97d240b448a17f0cd1df3ee36580
 SHA512:
-  metadata.gz: a6a910451f2f1cd6c342441f2267fa75b1db5228ccb6be1d2580d9673f3a316b8dcc5ce6e8842129d5136b04d352d629df3a2b358f7a1cc3f9a1c56f61360dcb
-  data.tar.gz: dd3c5e2644fcff4aeffe72a858a102f5a23b453c7d9162f54e9594cfdd91812725cb5e5987b0ef2f36aa19d4586d63bb606ef7b4536c724852bb6e33594b681d
+  metadata.gz: e374e3b0989135b0ad8f07d0efdae889d3e44e5013dc6427823cda3fc9c5eb9bdbef6fa85b2ef8b8a1e6aa853eee73bd09ee61f699ef6bdcb3e2887f087d8723
+  data.tar.gz: 98ca09e11b1fc6b4376f6497e49c2acdffc63a0bf6f68d23732518aacd35cd39c2b3e3dd60486d833ef28a7585635c55095b6a1dcb37c99aba4b3d3922b9d0f8

data/ChangeLog.md

@@ -1,3 +1,11 @@
+# 0.4.1
+
+* Don't always assume the local username as the remote username for SSH
+  connections:
+  * `user@host`: connect with `user@host`
+  * `host`: connect with `host` (username will be obtained by SSH itself from
+    either its configuration files or the current username)
+
 # 0.4.0
 
 * Redesign build of RPM package

data/lib/chake/backend.rb

@@ -37,7 +37,7 @@ module Chake
     end
 
     def run_as_root(cmd)
-      if node.username == 'root'
+      if node.remote_username == 'root'
         run(cmd)
       else
         run('sudo sh -c "' + cmd + '"')

data/lib/chake/backend/ssh.rb

@@ -39,7 +39,7 @@ module Chake
       end
 
       def ssh_target
-        [node.username, node.hostname].compact.join('@')
+        [node.remote_username, node.hostname].compact.join('@')
       end
 
     end

data/lib/chake/node.rb

@@ -12,6 +12,7 @@ module Chake
 
     attr_reader :hostname
     attr_reader :username
+    attr_reader :remote_username
     attr_reader :path
     attr_reader :data
 
@@ -35,6 +36,7 @@ module Chake
 
       @hostname = uri.host
       @username = uri.user || Etc.getpwuid.name
+      @remote_username = uri.user
       @path = uri.path || "/var/tmp/chef.#{username}"
       @data = data
 

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.4"
+  VERSION = "0.4.1"
 end

data/spec/chake/backend/ssh_spec.rb

@@ -10,4 +10,15 @@ describe Chake::Backend::Ssh do
 
   it('rsyncs over ssh') { expect(backend.rsync_dest).to eq('myuser@myhost:/srv/chef/') }
 
+  it 'uses no remote username if none was passed' do
+    node = Chake::Node.new('theserver')
+    expect(node.username).to eq(Etc.getpwuid.name)
+    expect(node.remote_username).to be_nil
+  end
+
+  it 'uses username is passwd' do
+    expect(node.username).to eq('myuser')
+    expect(node.remote_username).to eq('myuser')
+  end
+
 end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ shared_examples "Chake::Backend" do |backend_class|
   end
 
   it('does not use sudo if already root') do
-    allow(backend.node).to receive(:username).and_return('root')
+    allow(backend.node).to receive(:remote_username).and_return('root')
     expect(backend).to receive(:run).with('something')
     backend.run_as_root('something')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Antonio Terceiro