chake 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f230a2853147575f1d743e3cc54e39153bdff2
-  data.tar.gz: 5f83cda5a8619054fee7d05055db00a45e492568
+  metadata.gz: fb57e3e260528eaf17a91083a19f87a4285637ec
+  data.tar.gz: 1a322072a748b118893ef5848fd7bb8d67f55b84
 SHA512:
-  metadata.gz: bad942fb4f796cca7160f12ad2e692daa4f7c2005ef3a7aecc5ac1cec3b3a0bf322a81b2f6af4689df92446f7a3aa513c9a7474d252527c58e1a2824388841f1
-  data.tar.gz: 4e7fc7bceb84d26ee6ab29ee4c8075b3f8e3087537aa65f56e4880cc63671ecc2aaa708b48577014bf2c7228d33d7279921f6ef62d10e7b5fd39c4d69ebffe03
+  metadata.gz: db1227f01c1dc35ec10633fd7c17ebe0ba50b9e4bffecc73d80b8624a772fcc87f93bd8d7fc11f42e9feae5bb4d6dd189ff58e057c5c64e42fa9e6325243f92d
+  data.tar.gz: 48cd44d3be61043676425b479366c281d133c4741b4193923cd60a43f9870fd8c516b6c9b4127a4f3cd9031b5f30fa564bc39f2734cc765a3c3bfdbc772c014d

data/ChangeLog.md

@@ -0,0 +1,5 @@
+# 0.2.3
+
+* No functional changes
+* Small changes to make chake compatible with Debian 7, and most of the
+  RPM-based distributions

data/Rakefile

@@ -1,7 +1,85 @@
 require "bundler/gem_tasks"
 
-task :default do
+task :test do
   sh 'rspec', '--color'
 end
 
-task :release => :default
+pkg = Gem::Specification.load('chake.gemspec')
+
+task :build do
+  chdir 'pkg' do
+    sh 'gem2tgz', "#{pkg.name}-#{pkg.version}.gem"
+  end
+end
+
+desc 'Create Debian source package'
+task 'build:debsrc' => [:build] do
+  dirname = "#{pkg.name}-#{pkg.version}"
+  chdir 'pkg' do
+    sh 'gem2deb', '--no-wnpp-check', '-s', '-p', pkg.name, "#{dirname}.gem"
+    chdir dirname do
+      sh 'dpkg-buildpackage', '-S', '-us', '-uc'
+    end
+  end
+end
+
+desc 'Create source RPM package'
+task 'build:rpmsrc' => [:build, 'pkg/chake.spec']
+
+file 'pkg/chake.spec' => 'chake.spec.erb' do |t|
+  require 'erb'
+  pkg = Gem::Specification.load('chake.gemspec')
+  template =  ERB.new(File.read('chake.spec.erb'))
+  File.open(t.name, 'w') do |f|
+    f.puts(template.result(binding))
+  end
+  puts "Generated #{t.name}"
+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
+  sh 'git', 'shortlog', last_tag + '..'
+end
+
+task :release => [:test, :obs]
+
+task :default => :test

data/chake.spec.erb

@@ -0,0 +1,46 @@
+%define name <%= pkg.name %>
+%define version <%= pkg.version %>
+%define unmangled_version <%= pkg.version %>
+%define release 1
+
+Summary: <%= pkg.summary %>
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source0: %{name}-%{unmangled_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
+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}
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+mkdir -p %{gembuilddir}
+rake build
+gem install --local --install-dir %{gembuilddir} --force pkg/*.gem
+mkdir -p %{buildroot}/%{_bindir}
+mv %{gembuilddir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{gembuilddir}/bin
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+/usr/lib/chake
+%{_bindir}/*
+

data/lib/chake/node.rb

@@ -26,7 +26,7 @@ module Chake
 
       @backend_name = uri.scheme
 
-      @hostname = uri.hostname
+      @hostname = uri.host
       @username = uri.user || Etc.getpwuid.name
       @path = uri.path || "/var/tmp/chef.#{username}"
       @data = data

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/chake/backend/ssh_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chake::Backend::Ssh do
 
-  include_examples "Chake::Backend", Chake::Backend::Ssh, ->() {  }
+  include_examples "Chake::Backend", Chake::Backend::Ssh
 
   let(:node) { Chake::Node.new('ssh://myuser@myhost/srv/chef') }
 

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 require 'chake/node'
 require 'chake/backend'
 
+require 'rspec/version'
+if RSpec::Version::STRING < '2.14'
+  puts "Skipping tests, need RSpec >= 2.14"
+  exit
+end
 
 shared_examples "Chake::Backend" do |backend_class|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Antonio Terceiro
@@ -63,12 +63,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/chake
 - chake.gemspec
+- chake.spec.erb
 - examples/test/Rakefile
 - examples/test/config.rb
 - examples/test/cookbooks/example/files/host-homer/test.asc