gusteau 1.0.1.dev → 1.0.2.dev

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.2.dev / 2013-07-06
+* Fix Ruby 1.8.7 and Rubinius compatibility
+
 ## 1.0.1.dev / 2013-07-05
 * Fix the project generator bug
 * Make project generator output look nicer

data/README.md

@@ -31,7 +31,7 @@ Gettings started
 Gusteau is a Ruby gem:
 
 ```
-gem install gusteau
+gem install gusteau --pre
 ```
 
 The following command generates an example Chef-repo:

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
 Rake::TestTask.new do |t|
   t.pattern = "spec/**/*_spec.rb"

data/gusteau.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh', '>= 2.2.2'
   gem.add_dependency 'archive-tar-minitar', '>= 0.5.2'
 
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'simplecov'

data/lib/gusteau/bureau.rb

@@ -14,7 +14,7 @@ module Gusteau
       @login   = Etc.getlogin
       @ssh_key = File.read(File.expand_path '~/.ssh/id_rsa.pub').chomp rescue 'Your SSH key'
 
-      abort "Directory #{name} already exists" if Dir.exists?(name)
+      abort "Directory #{name} already exists" if File.exists?(name)
     end
 
     def generate!(init = true)

data/lib/gusteau/compressed_tar_stream.rb

@@ -14,7 +14,8 @@ module Gusteau
           print '.'
           Archive::Tar::Minitar.pack_file(f, tar)
         end
-        tar.close.string.force_encoding('ASCII-8BIT').tap { |data|
+        tar.close.string.tap { |data|
+          data.force_encoding('binary') if data.respond_to?(:force_encoding)
           puts " (compressed down to #{data.size} bytes)"
         }
       end

data/lib/gusteau/server.rb

@@ -18,7 +18,10 @@ module Gusteau
 
     def upload(files_and_dirs, dest_dir, opts={})
       log "#uploading #{files_and_dirs.join(' ')} to #{@host}:#{dest_dir}" do
-        files = Find.find(*files_and_dirs).select { |f| f unless opts[:exclude] && f.include?(opts[:exclude]) }
+        files = []
+        Find.find(*files_and_dirs) do |f|
+          files << f unless(opts[:exclude] && f.include?(opts[:exclude]))
+        end
         send_files(files, dest_dir)
       end
     end

data/lib/gusteau/ssh_config.rb

@@ -6,7 +6,7 @@ module Gusteau
     def initialize(nodes)
       @config = []
 
-      nodes.each_pair do |name, node|
+      nodes.sort.each do |name, node|
         if server = node.server
           @config << section(name, server)
         end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.0.1.dev"
+  VERSION = "1.0.2.dev"
 end

data/spec/lib/gusteau/bureau_spec.rb

@@ -19,14 +19,14 @@ describe Gusteau::Bureau do
   describe "#generate!" do
     before { subject.generate!(false) }
     it "should create a basic structure" do
-      assert Dir.exists?(bureau_path)
+      assert File.exists?(bureau_path)
 
       %w{ Berksfile Vagrantfile .kitchen.yml }.each do |f|
         assert File.exists?("#{bureau_path}/#{f}")
       end
 
       %w{ data_bags site-cookbooks test }.each do |d|
-        assert Dir.exists?("#{bureau_path}/#{d}")
+        assert File.exists?("#{bureau_path}/#{d}")
       end
     end
 

data/spec/lib/gusteau/config_spec.rb

@@ -13,7 +13,7 @@ describe Gusteau::Config do
     let(:nodes) { Gusteau::Config.nodes("./spec/config/remi.yml") }
 
     it "should name nodes as per environment-node" do
-      nodes.keys.must_equal ["production-db", "production-www"]
+      nodes.keys.sort.must_equal ["production-db", "production-www"]
     end
 
     it "should override run_list if defined for a node" do

data/spec/lib/gusteau/log_spec.rb

@@ -2,7 +2,7 @@ require './spec/spec_helper'
 
 describe Gusteau::Log do
 
-  let(:fixed_time)   { Time.new(2013,7,25, 14,40,23, "+00:00") }
+  let(:fixed_time)   { Time.parse("2013-07-25 14:40:23 UTC") }
 
   let(:logger_class) { class Example; include Gusteau::Log; end }
   let(:logger)       { logger_class.new }

data/spec/lib/gusteau/ssh_config_spec.rb

@@ -13,11 +13,6 @@ Host development-playground
   Port 22
   User root
 
-Host staging-www
-  HostName staging.myapp.com
-  Port 22
-  User root
-
 Host production-db
   HostName db.myapp.com
   Port 22
@@ -28,6 +23,11 @@ Host production-www
   Port 22
   User billy
 
+Host staging-www
+  HostName staging.myapp.com
+  Port 22
+  User root
+
 # END GUSTEAU NODES
     eos
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.1.dev
+  version: 1.0.2.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -124,6 +124,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +283,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1972838977099657427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: