knife-solo 0.2.0.pre1 → 0.2.0

data/CHANGELOG.md

@@ -1,7 +1,8 @@
-# 0.2.0: _Not released yet_
+# 0.2.0: February 12, 2013
 
 ## Changes and new features
 
+* Post-install hook to remind people about removing old gems (#152)
 * Support Chef 11 (#183)
 * Rename Cook command's `--skip-chef-check` option to `--no-chef-check (#162)
 * Rename `--ssh-identity` option to `--identity-file` (#178)
@@ -9,6 +10,7 @@
 * Add `--no-librarian` option to bootstrap and cook commands (#180)
 * Generate Cheffile and .gitignore on `knife solo init --librarian` (#182)
 * Windows client compatibility (#156, #91)
+* Support Amazon Linux (#181)
 * Support unknown/unreleased Debian versions by using the
   gem installer (#172)
 * Drop support for Debian 5.0 Lenny (#172)
@@ -21,13 +23,16 @@
 * Fix compatibility with Ruby 1.8.7 on work station (#170)
 * Fix Chef version checking if sudo promts password (#190)
 * Fix compatibility (net-ssh dependency) with Chef 10.20.0 and 11.2.0 (#188)
-* Other fixes: #166, #168, #173
+* Fail CI if manifest isn't updated (#195)
+* Better unit tests around solo cook
+* Other fixes: #166, #168, #173, #194
 
 ## Thanks to our contributors!
 
 * [Russell Cardullo][russellcardullo]
-* "[tknerr][]"
+* [tknerr][tknerr]
 * [Shaun Dern][smdern]
+* [Mike Bain][TheAlphaTester]
 
 # 0.1.0: January 12, 2013
 
@@ -233,6 +238,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [Frozenproduce]: https://github.com/Frozenproduce
 [Motiejus]:      https://github.com/Motiejus
 [Nix-wie-weg]:   https://github.com/Nix-wie-weg
+[TheAlphaTester]:https://github.com/TheAlphaTester
 [TylerRick]:     https://github.com/TylerRick
 [aaronjensen]:   https://github.com/aaronjensen
 [amoslanka]:     https://github.com/amoslanka

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require File.join(File.dirname(__FILE__), 'lib', 'knife-solo', 'info')
 
 MANIFEST_IGNORES = %w[
     .travis.yml
@@ -13,15 +14,26 @@ MANIFEST_IGNORES = %w[
     script/test
   ]
 
-desc 'Updates Manifest.txt with a list of files from git'
-task :manifest do
-  git_files = `git ls-files`.split("\n")
 
-  File.open('Manifest.txt', 'w') do |f|
-    f.puts((git_files - MANIFEST_IGNORES).join("\n"))
+namespace :manifest do
+  desc 'Checks for outstanding changes to the manifest'
+  task :verify => :update do
+    changes = `git status --porcelain Manifest.txt`
+    raise "Manifest has not been updated" unless changes.empty?
+  end
+
+  desc 'Updates Manifest.txt with a list of files from git'
+  task :update do
+    git_files = `git ls-files`.split("\n")
+
+    File.open('Manifest.txt', 'w') do |f|
+      f.puts((git_files - MANIFEST_IGNORES).join("\n"))
+    end
   end
 end
-task :release => :manifest
+
+desc 'Alias to manifest:update'
+task :manifest => 'manifest:update'
 
 # Returns the parsed RDoc for a single file as HTML
 # Somewhat gnarly, but does the job.
@@ -51,12 +63,11 @@ task 'gh-pages' do
     end
     rev = `git rev-parse HEAD`[0..7]
     Dir.chdir(clone) do
-      sh "git commit --allow-empty -m 'Updated index from README.rdoc rev #{rev}' index.html"
+      sh "git commit --allow-empty -m 'Update index for v#{KnifeSolo.version} from README.rdoc rev #{rev}' index.html"
       sh "git push origin gh-pages"
     end
   end
 end
-task :release => 'gh-pages'
 
 namespace :test do
   Rake::TestTask.new(:integration) do |t|
@@ -73,6 +84,11 @@ namespace :test do
   task :all => [:units, :integration]
 end
 
-desc "Alias for test:units"
-task :test => ['test:units']
+desc 'Alias for test:units'
+task :test => 'test:units'
+
 task :default => :test
+task :default => 'manifest:verify'
+
+task :release => :manifest
+task :release => 'gh-pages' unless KnifeSolo.prerelease?

data/lib/knife-solo/bootstraps/linux.rb

@@ -82,6 +82,8 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{CentOS.*? 6}
         {:type => "yum_omnibus", :version => "RHEL6"}
+      when %r{Amazon Linux}
+        {:type => "yum_omnibus", :version => "RHEL6"}
       when %r{Red Hat Enterprise.*? 5}
         {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{Red Hat Enterprise.*? 6}

data/lib/knife-solo/info.rb

@@ -1,5 +1,24 @@
 module KnifeSolo
   def self.version
-    '0.2.0.pre1'
+    '0.2.0'
+  end
+
+  def self.post_install_message
+    <<-TXT.gsub(/^ {6}/, '').strip
+      Thanks for installing knife-solo!
+
+      If you run into any issues please let us know at:
+        https://github.com/matschaffer/knife-solo/issues
+
+      If you are upgrading knife-solo please uninstall any old versions by
+      running `gem clean knife-solo` to avoid any errors.
+
+      See http://bit.ly/CHEF-3255 for more information on the knife bug
+      that causes this.
+    TXT
+  end
+
+  def self.prerelease?
+    Gem::Version.new(self.version).prerelease?
   end
 end

data/test/integration/amazon_linux_2012_09_bootstrap_test.rb

@@ -0,0 +1,17 @@
+require 'integration_helper'
+
+class AmazonLinux2012_09BootstrapTest < IntegrationTest
+  def user
+    "ec2-user"
+  end
+
+  def image_id
+    "ami-1624987f"
+  end
+
+  def prepare_server
+    # Do nothing as `solo bootstrap` will do everything
+  end
+
+  include Apache2Bootstrap
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
 - test/gitignore_test.rb
+- test/integration/amazon_linux_2012_09_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/empty_cook.rb
@@ -255,7 +256,11 @@ files:
 - test/test_helper.rb
 homepage: http://matschaffer.github.com/knife-solo/
 licenses: []
-post_install_message: 
+post_install_message: ! "Thanks for installing knife-solo!\n\nIf you run into any
+  issues please let us know at:\n  https://github.com/matschaffer/knife-solo/issues\n\nIf
+  you are upgrading knife-solo please uninstall any old versions by\nrunning `gem
+  clean knife-solo` to avoid any errors.\n\nSee http://bit.ly/CHEF-3255 for more information
+  on the knife bug\nthat causes this."
 rdoc_options: []
 require_paths:
 - lib
@@ -268,9 +273,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -281,6 +286,7 @@ test_files:
 - test/bootstraps_test.rb
 - test/deprecated_command_test.rb
 - test/gitignore_test.rb
+- test/integration/amazon_linux_2012_09_bootstrap_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/empty_cook.rb