chake 0.93 → 0.93.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e89bfb172b6733b9c8fb9b2d793e3b0470077850d294ec81c56a0bbc55a28b2
-  data.tar.gz: 59de754c4cb0ef93964711c9057db81da593aabaf95d83ff3ba7796719f3b979
+  metadata.gz: 8d0f86aa2668f7ed10209e4c2cbd7f93b8ef91692e6367761de0f513e56792d6
+  data.tar.gz: 94cfb76752108b360e87f113e6540eb498d0e0af82ee67ee80f31c92c6afd5d7
 SHA512:
-  metadata.gz: fb264a8d9d1781b336c16c84f96bec3ee6cbf858c68804660b98eae5fa747dcb8b155166dd8c91e7c8baf68f77f5a2f8cde59406495c538d7502955cf1b87968
-  data.tar.gz: 6f12e02d6186521dcb72405f407cc3b5d4e27e7570b31a7b86fdd445c949c9322ce7004c6582cd375bbeaab2c3c07e9631f3d2e99c4a288fb68b14f697a01c55
+  metadata.gz: 8cda49eebf38e00bcb0d445f1b0d909f7cad5e9cb62bccda65bd6105aefb7e743f241c376e8e745f3a22f2fd995389dbfd2deed43ea418ceec5318ce4dc200f5
+  data.tar.gz: 8db81e5c3a31d0dc6783affa82faf944970ef12b7bbdca3a618aabe3816a15cb6403d389ea6cb118a08cc755299e3876d142b169d15c299d3eb3770f77380e75

data/ChangeLog.md

@@ -1,3 +1,13 @@
+# 0.93.2
+
+- rake check: don't require sudo if connecting as root
+- Rename method that provides the base rsync command
+- Add task to automated new releases
+
+# 0.93.1
+
+- Fix NoMethodError in preview task
+
 # 0.93
 
 - Chef::ConfigManager: add support for inheritance

data/README.md

@@ -124,11 +124,13 @@ To check whether hosts are correctly configured, you can use the `check` task:
 $ rake check
 ```
 
-That will run the the `sudo true` command on each host. If that pass without
-you having to type any passwords, it means that:
+That will run the the `true` command as root on each host (using sudo is
+necessary). If that pass without you having to type any passwords, it means
+that:
 
 * you have SSH access to each host; and
-* the user you are connecting as has password-less sudo correctly setup.
+* the user you are connecting as is root or has password-less sudo correctly
+  setup.
 
 ## Applying configuration
 

data/Rakefile

@@ -90,6 +90,33 @@ task :manifest do
   end
 end
 
+desc 'Starts a new release'
+task :new_release do
+  last_tag = `git tag | sort -V`.split.last
+  last_version = last_tag.sub(/^v/, '')
+  v = last_tag.sub(/^v/, '').split('.').map(&:to_i)
+  v[-1] += 1
+  suggested_version = v.join('.')
+  printf "Next version [#{suggested_version}]: "
+  version = $stdin.gets.strip
+  if version == ''
+    version = suggested_version
+  end
+  mv 'ChangeLog.md', 'ChangeLog.orig'
+  sh "(echo '# #{version}' && echo) > ChangeLog.md"
+  sh "git log --oneline --no-merges --reverse --format='- %s' #{last_tag}.. >> ChangeLog.md"
+  sh '(echo && cat ChangeLog.orig) >> ChangeLog.md && rm -f ChangeLog.orig'
+  sh "sed -i -e 's/#{last_version}/#{version}/' lib/chake/version.rb"
+  sh 'git diff'
+  printf 'Confirm [y/N]? '
+  if $stdin.gets.strip.downcase != 'y'
+    next
+  end
+
+  sh "git commit -a -m 'New release'"
+  sh 'rake release'
+end
+
 desc 'Makes a release'
 task release: [:check_tag, :check_changelog, :default, 'bundler:release']
 
@@ -100,7 +127,7 @@ end
 
 desc 'Check spelling in the source code'
 task :codespell do
-  sh 'codespell', '--skip=.git', '--skip=coverage', '--skip=*.asc', '--skip=*.swp', '--skip=tags', '--skip=*.1', '--skip=pkg'
+  sh 'codespell', '--skip=.git', '--skip=coverage', '--skip=*.asc', '--skip=*.swp', '--skip=tags', '--skip=*.1', '--skip=pkg', '--skip=man'
 end
 
 task default: [:test, :style, :codespell]

data/lib/chake/config_manager/itamae.rb

@@ -21,6 +21,9 @@ module Chake
         case node.connection
         when Chake::Connection::Ssh
           cmd << 'ssh' << "--user=#{node.username}" << "--host=#{node.hostname}"
+          if node.username == 'root'
+            cmd << '--no-sudo'
+          end
           cmd += ssh_config
         when Chake::Connection::Local
           if node.username == 'root'

data/lib/chake/connection/ssh.rb

@@ -9,7 +9,7 @@ module Chake
         "#{ssh_target}:"
       end
 
-      def rsync
+      def rsync_cmd
         [ssh_prefix, 'rsync', rsync_ssh].flatten.compact
       end
 

data/lib/chake/connection.rb

@@ -14,7 +14,7 @@ module Chake
       ''
     end
 
-    def rsync
+    def rsync_cmd
       ['rsync']
     end
 

data/lib/chake/node.rb

@@ -37,7 +37,7 @@ module Chake
       @connection ||= Chake::Connection.get(@connection_name).new(self)
     end
 
-    def_delegators :connection, :run, :run_as_root, :run_shell, :rsync, :rsync_dest, :scp, :scp_dest, :skip?
+    def_delegators :connection, :run, :run_as_root, :run_shell, :rsync_cmd, :rsync_dest, :scp, :scp_dest, :skip?
 
     def config_manager
       @config_manager ||= Chake::ConfigManager.get(self)

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = '0.93'.freeze
+  VERSION = '0.93.2'.freeze
 end

data/lib/chake.rb

@@ -148,7 +148,7 @@ Chake.nodes.each do |node|
     rsync_excludes << '--exclude' << 'nodes/'
     rsync_excludes << '--exclude' << 'local-mode-cache/'
 
-    rsync = node.rsync + ['-ap'] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
+    rsync = node.rsync_cmd + ['-ap'] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
     rsync_logging = (Rake.application.options.trace && '--verbose') || '--quiet'
 
     hash_files = Dir.glob(File.join(Chake.tmpdir, '*.sha1sum'))
@@ -187,7 +187,7 @@ Chake.nodes.each do |node|
   desc "Preview changes when converging #{hostname}"
   task "preview:#{hostname}" => converge_dependencies do
     maybe_decrypt(node) do
-      node.dry_run
+      node.preview
     end
   end
 
@@ -211,7 +211,7 @@ Chake.nodes.each do |node|
 
   desc 'checks connectivity and setup on all nodes'
   task "check:#{hostname}" => [:connect_common, "connect:#{hostname}"] do
-    node.run('sudo echo OK')
+    node.run_as_root('echo OK')
   end
 
   # needs to be overridden in user projects
@@ -284,7 +284,7 @@ desc 'checks connectivity and setup on all nodes'
 multitask check: (Chake.nodes.map { |node| "check:#{node.hostname}" }) do
   puts '✓ all hosts OK'
   puts '  - ssh connection works'
-  puts '  - password-less sudo works'
+  puts '  - password-less sudo (if needed) works'
 end
 
 desc 'runs a Ruby console in the chake environment'

metadata

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