Your message dated Sat, 29 Nov 2014 10:07:53 +0100 with message-id <54798ce9.5010...@thykier.net> and subject line Re: Bug#771388: unblock: serverspec-runner/0.2.4-2 has caused the Debian Bug report #771388, regarding unblock: serverspec-runner/0.2.4-2 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 771388: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771388 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock Dear release team, Please unblock package serverspec-runner, which fixes unusable RC bug. The fixed version of package is reviewed and sponsored into unstable. The point which two patches fixes: 1 change template path - cover a loss of templates - place templates into /usr/share (upstream assumes they are in current directory just checked out) - fix script to correctly find templates 2 fix template content - support older syntax of serve/rspec (upstream assumes latest, so there are some imcompatible syntax) The debdiff against version 0.2.4-1 in testing is as follows: -- diff -Nru serverspec-runner-0.2.4/debian/changelog serverspec-runner-0.2.4/debian/changelog --- serverspec-runner-0.2.4/debian/changelog 2014-10-24 14:25:57.000000000 +0900 +++ serverspec-runner-0.2.4/debian/changelog 2014-11-28 17:14:27.000000000 +0900 @@ -1,3 +1,12 @@ +serverspec-runner (0.2.4-2) unstable; urgency=high + + * Patch to fix grave bug disturbing to use from scratch. (Closes: #769221) + - complete set of templates into /usr/share/serverspec-runner/. + - modify script to search above template instead of current path. + - fix template to cope with Debian. + + -- KURASHIKI Satoru <lur...@gmail.com> Wed, 26 Nov 2014 12:32:06 +0900 + serverspec-runner (0.2.4-1) unstable; urgency=medium * Initial release (Closes: #766500) diff -Nru serverspec-runner-0.2.4/debian/patches/debianize-spec-template serverspec-runner-0.2.4/debian/patches/debianize-spec-template --- serverspec-runner-0.2.4/debian/patches/debianize-spec-template 1970-01-01 09:00:00.000000000 +0900 +++ serverspec-runner-0.2.4/debian/patches/debianize-spec-template 2014-11-28 17:13:10.000000000 +0900 @@ -0,0 +1,68 @@ +Index: serverspec-runner/spec/spec_helper.rb +=================================================================== +--- serverspec-runner.orig/spec/spec_helper.rb ++++ serverspec-runner/spec/spec_helper.rb +@@ -4,6 +4,7 @@ require 'net/ssh' + require 'yaml' + require 'csv' + require 'serverspec-runner/util/hash' ++include SpecInfra::Helper::DetectOS + + ssh_opts_default = YAML.load_file(ENV['ssh_options']) + csv_path = ENV['result_csv'] +@@ -23,7 +24,6 @@ end + + RSpec.configure do |c| + +- c.expose_current_running_example_as :example + c.path = ENV['EXEC_PATH'] + + run_path = c.files_to_run[0].split('/') +@@ -53,10 +53,10 @@ RSpec.configure do |c| + property[:ssh_opts].each { |k, v| ssh_opts[k.to_sym] = v } if property[:ssh_opts] + user = options[:user] || ssh_opts[:user] || Etc.getlogin + options.merge!(ssh_opts) +- set :ssh_options, options +- set :backend, :ssh ++ include SpecInfra::Helper::Ssh ++ SpecInfra.configuration.ssh = Net::SSH::start(c.host, user, options) + else +- set :backend, :exec ++ include SpecInfra::Helper::Exec + end + + prev_desc_hierarchy = nil +Index: serverspec-runner/spec/example/default.rb +=================================================================== +--- serverspec-runner.orig/spec/example/default.rb ++++ serverspec-runner/spec/example/default.rb +@@ -1,24 +1,24 @@ + require "#{File.dirname(__FILE__)}/../spec_helper" + +-describe package('httpd'), :if => os[:family] == 'redhat' do ++describe package('httpd'), :if => os[:family] == 'RedHat' do + it { should be_installed } + end + +-describe package('apache2'), :if => os[:family] == 'ubuntu' do ++describe package('apache2'), :if => os[:family] == 'Debian' do + it { should be_installed } + end + +-describe service('httpd'), :if => os[:family] == 'redhat' do ++describe service('httpd'), :if => os[:family] == 'RedHat' do + it { should be_enabled } + it { should be_running } + end + +-describe service('apache2'), :if => os[:family] == 'ubuntu' do ++describe service('apache2'), :if => os[:family] == 'Debian' do + it { should be_enabled } + it { should be_running } + end + +-describe service('org.apache.httpd'), :if => os[:family] == 'darwin' do ++describe service('org.apache.httpd'), :if => os[:family] == 'Darwin' do + it { should be_enabled } + it { should be_running } + end diff -Nru serverspec-runner-0.2.4/debian/patches/fix-path-issue serverspec-runner-0.2.4/debian/patches/fix-path-issue --- serverspec-runner-0.2.4/debian/patches/fix-path-issue 1970-01-01 09:00:00.000000000 +0900 +++ serverspec-runner-0.2.4/debian/patches/fix-path-issue 2014-11-28 17:12:59.000000000 +0900 @@ -0,0 +1,50 @@ +Index: serverspec-runner/Rakefile +=================================================================== +--- serverspec-runner.orig/Rakefile ++++ serverspec-runner/Rakefile +@@ -12,13 +12,15 @@ task :spec => 'spec:all' + + namespace :spec do + ++ ENV['TEMPLATE_PATH'] = ENV['TEMPLATE_PATH'] || '/usr/share/serverspec-runner' ++ + ENV['EXEC_PATH'] = '/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin' + + ENV['specroot'] = ENV['specroot'] || "." + ENV['specpath'] = "#{ENV['specroot']}/spec" + +- ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/ssh_options_default.yml" || "#{File.dirname(__FILE__)}/ssh_options_default.yml" +- ENV['ssh_options'] = "#{File.dirname(__FILE__)}/ssh_options_default.yml" unless File.exists?(ENV['ssh_options']) ++ ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/ssh_options_default.yml" ++ ENV['ssh_options'] = "#{ENV['TEMPLATE_PATH']}/ssh_options_default.yml" unless File.exists?(ENV['ssh_options']) + ssh_options = YAML.load_file(ENV['ssh_options']) + ENV['result_csv'] = ENV['result_csv'] || './_serverspec_result.csv' + csv_file = ENV['result_csv'] +@@ -38,10 +40,10 @@ namespace :spec do + end + + FileUtils.mkdir_p(path) +- FileUtils.cp("#{File.dirname(__FILE__)}/scenario.yml", ENV['specroot']) +- FileUtils.cp("#{File.dirname(__FILE__)}/ssh_options_default.yml", ENV['specroot']) +- FileUtils.cp("#{File.dirname(__FILE__)}/.rspec", ENV['specroot']) +- FileUtils.cp_r("#{File.dirname(__FILE__)}/spec/.", path) ++ FileUtils.cp("#{ENV['TEMPLATE_PATH']}/scenario.yml", ENV['specroot']) ++ FileUtils.cp("#{ENV['TEMPLATE_PATH']}/ssh_options_default.yml", ENV['specroot']) ++ FileUtils.cp("#{ENV['TEMPLATE_PATH']}/.rspec", ENV['specroot']) ++ FileUtils.cp_r("#{ENV['TEMPLATE_PATH']}/spec/.", path) + + puts("Please edit \"#{ENV['specroot']}/scenario.yml\" and change directory to \"#{ENV['specroot']}\" and exec \"serverspec-runner\" command !!") + end +Index: serverspec-runner/bin/serverspec-runner +=================================================================== +--- serverspec-runner.orig/bin/serverspec-runner ++++ serverspec-runner/bin/serverspec-runner +@@ -53,7 +53,7 @@ opts.each do |opt, arg| + end + + Rake::TaskManager.record_task_metadata = showtasks +-load "#{File.dirname(__FILE__)}/../Rakefile" ++load "/usr/share/serverspec-runner/Rakefile" + + if showtasks + mLen = (Rake.application.tasks.max_by { |t| t.name_with_args.size }).name_with_args.size diff -Nru serverspec-runner-0.2.4/debian/patches/series serverspec-runner-0.2.4/debian/patches/series --- serverspec-runner-0.2.4/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ serverspec-runner-0.2.4/debian/patches/series 2014-11-28 17:13:27.000000000 +0900 @@ -0,0 +1,2 @@ +fix-path-issue +debianize-spec-template diff -Nru serverspec-runner-0.2.4/debian/serverspec-runner.docs serverspec-runner-0.2.4/debian/serverspec-runner.docs --- serverspec-runner-0.2.4/debian/serverspec-runner.docs 2014-10-23 11:34:52.000000000 +0900 +++ serverspec-runner-0.2.4/debian/serverspec-runner.docs 2014-11-12 21:33:55.000000000 +0900 @@ -1,4 +1 @@ README.md -scenario.yml -ssh_options_default.yml -spec diff -Nru serverspec-runner-0.2.4/debian/serverspec-runner.install serverspec-runner-0.2.4/debian/serverspec-runner.install --- serverspec-runner-0.2.4/debian/serverspec-runner.install 1970-01-01 09:00:00.000000000 +0900 +++ serverspec-runner-0.2.4/debian/serverspec-runner.install 2014-11-12 21:55:30.000000000 +0900 @@ -0,0 +1,6 @@ +spec usr/share/serverspec-runner +.rspec usr/share/serverspec-runner +Rakefile usr/share/serverspec-runner +scenario.yml usr/share/serverspec-runner +ssh_options_default.yml usr/share/serverspec-runner + -- unblock serverspec-runner/0.2.4-2 -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.32-30-pve (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
--- End Message ---
--- Begin Message ---On 2014-11-29 03:18, KURASHIKI Satoru wrote: > Package: release.debian.org > Severity: normal > User: release.debian....@packages.debian.org > Usertags: unblock > > Dear release team, > > Please unblock package serverspec-runner, which > fixes unusable RC bug. > The fixed version of package is reviewed and sponsored > into unstable. > > The point which two patches fixes: > 1 change template path > - cover a loss of templates > - place templates into /usr/share (upstream assumes > they are in current directory just checked out) > - fix script to correctly find templates > 2 fix template content > - support older syntax of serve/rspec (upstream > assumes latest, so there are some imcompatible syntax) > > [...] > -- > > unblock serverspec-runner/0.2.4-2 > > [...] Unblocked, thanks. ~Niels
--- End Message ---
