chake 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c0ada57c6acd1ba0a23069a528397144d0e61c
-  data.tar.gz: 030adffa33315100225ab10a63a7038e9f6fd512
+  metadata.gz: 8a066ad18b894e6b4a17a6e67ddeea63e4120f56
+  data.tar.gz: 00cfd9eadc606cd339292a23ad92a35b1d519a96
 SHA512:
-  metadata.gz: 866152de25dbedae6edc9b3ad993b425a468c04dfaf9e8fa13bb2ba597128801fbdc46f33ea101919dd02ea2e99a4de98e9c663ae72a12cfe84780ee7b527eac
-  data.tar.gz: 608ccff3b9143a48bb16ca44f9746964f10481389e42cc91cf566889d2fdf224956a0f164b73d6515a7c7d9fb09fee8ef7488f7d2ef50aaec7666687e41e3a88
+  metadata.gz: 3c4df34f504c93cbc041bd7a0eb8364b8f82163ac9a0fafe7dbf8f2980d2792a7d3d9eba727cd8709889564edc0ba4ea653e986b93628d56d8d26b07caf2d6d8
+  data.tar.gz: 1e7531dd97822ec1afce9e1fc2b56175c6f0547639ccd9c5924846cefd369ca40be35c6c549ce5cd1306231681166608409b44b01c2c258cc93c5be54c3eb77e

data/ChangeLog.md

@@ -1,3 +1,12 @@
+# 0.10.2
+
+* Fix check for modified files at the upload phase. Now chake will properly
+  avoiding rsync calls when there is no changed files since the latest upload.
+* Fix generated RPM spec file. Will now properly build, install, and work under
+  both CentOS 7 and Fedora 22+.
+* Collect test coverage statistics when running tests.
+  * Added dependency on simplecov
+
 # 0.10.1
 
 * actually implement support for custom ports in Node URL's. Despite being

data/Rakefile

@@ -34,7 +34,11 @@ task 'deb:install' => 'build:debsrc'do
 end
 
 desc 'Create source RPM package'
-task 'build:rpmsrc' => ['build:tarball', 'pkg/chake.spec']
+task 'build:rpmsrc' => ['build:tarball', 'pkg/chake.spec'] do
+  chdir 'pkg' do
+    sh 'rpmbuild --define "_topdir .rpmbuild" --define "_sourcedir $(pwd)" --define "_srcrpmdir $(pwd)" -bs chake.spec --nodeps'
+  end
+end
 
 file 'pkg/chake.spec' => ['chake.spec.erb', 'lib/chake/version.rb'] do |t|
   require 'erb'

data/chake.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
 
   spec.add_dependency "rake"
 end

data/chake.spec.erb

@@ -1,47 +1,41 @@
-%define name <%= pkg.name %>
-%define version <%= pkg.version %>
-%define unmangled_version <%= pkg.version %>
-%define release 1
+%define gem_name <%= pkg.name %>
 
 Summary: <%= pkg.summary %>
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0: %{name}-%{unmangled_version}.tar.gz
+Name: <%= pkg.name %>
+Version: <%= pkg.version %>
+Release: 1
+Source0: %{name}-%{version}.tar.gz
 License: <%= pkg.license %>
 Group: Development/Tools
 Prefix: %{_prefix}
 Vendor: <%= pkg.authors.first %> <<%= pkg.email.first %>>
 Url: <%= pkg.homepage %>
 BuildArch: noarch
-BuildRequires: ruby, rubygem-rake, rubygem-bundler
+BuildRequires: ruby, rubygems-devel, rubygem-rake, rubygem-bundler
 Requires: ruby, rubygem-rake
 
-%define gemdir <%= Gem.dir %>
-%define gembuilddir %{buildroot}%{gemdir}
-
 %description
 <%= pkg.description %>
 
 %prep
-%setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version}
+%setup -n %{name}-%{version}
 
 %build
 
-%install
 %{__rm} -rf %{buildroot}
-mkdir -p %{gembuilddir}
 sed -i -e 's#spec.files\s*=.*#spec.files = Dir.glob("**/*")#' %{name}.gemspec
-rake build
-gem install --local --install-dir %{gembuilddir} --force pkg/%{name}-%{version}.gem
-mkdir -p %{buildroot}/%{_bindir}
-mv %{gembuilddir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{gembuilddir}/bin
+rake bundler:build
+%gem_install -n pkg/%{name}-%{version}.gem
+
+%install
+cp -a usr %{buildroot}/usr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{gemdir}
-%{_bindir}/*
-
+%{gem_instdir}/
+%exclude %{gem_cache}
+%{gem_spec}
+%{_bindir}/chake
+%doc %{gem_docdir}

data/examples/test/Rakefile

@@ -15,5 +15,5 @@ manifest = %w[
 
 desc 'removes everything'
 task :clean do
-  rm_rf Dir.glob('*') - manifest
+  rm_rf Dir.glob('**/*') - manifest
 end

data/lib/chake.rb

@@ -99,14 +99,23 @@ def if_files_changed(node, group_name, files)
   if files.empty?
     return
   end
-  hash = IO.popen(['sha1sum', *files]).read
+  hash_io = IO.popen(['xargs', 'sha1sum'], 'w+')
+  files.sort.each { |f| hash_io.puts(f) }
+  hash_io.close_write
+  current_hash = hash_io.read
+
   hash_file = File.join($chake_tmpdir, node + '.' + group_name + '.sha1sum')
-  if !File.exists?(hash_file) || File.read(hash_file) != hash
+  hash_on_disk = nil
+  if File.exists?(hash_file)
+    hash_on_disk = File.read(hash_file)
+  end
+
+  if current_hash != hash_on_disk
     yield
   end
   FileUtils.mkdir_p(File.dirname(hash_file))
   File.open(hash_file, 'w') do |f|
-    f.write(hash)
+    f.write(current_hash)
   end
 end
 
@@ -179,7 +188,8 @@ $nodes.each do |node|
     rsync = node.rsync + ["-avp"] + ENV.fetch('CHAKE_RSYNC_OPTIONS', '').split
     rsync_logging = Rake.application.options.silent && '--quiet' || '--verbose'
 
-    files = Dir.glob("**/*").select { |f| !File.directory?(f) } - encrypted.keys - encrypted.values
+    hash_files = Dir.glob(File.join($chake_tmpdir, '*.sha1sum'))
+    files = Dir.glob("**/*").select { |f| !File.directory?(f) } - encrypted.keys - encrypted.values - hash_files
     if_files_changed(hostname, 'plain', files) do
       sh *rsync, '--delete', rsync_logging, *rsync_excludes, './', node.rsync_dest
     end

data/lib/chake/version.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'chake/node'
 require 'chake/backend'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Antonio Terceiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement