Permalink
Browse files

Merged with master

  • Loading branch information...
2 parents ffefbf6 + d33ec93 commit fd810efa89e18237e584e30e8bdcd450d84bab2e @auser committed Sep 4, 2011
Showing with 33 additions and 512 deletions.
  1. +1 −1 Gemfile
  2. +4 −10 Gemfile.lock
  3. +1 −10 Rakefile
  4. +0 −5 VERSION.yml
  5. +0 −39 config/jeweler.rb
  6. +3 −2 lib/cloud_providers/connections.rb
  7. +4 −5 lib/poolparty.rb
  8. +3 −0 lib/poolparty/version.rb
  9. +17 −440 poolparty.gemspec
View
@@ -18,5 +18,5 @@ group :test do
end
group :development do
- gem 'jeweler'
+ gem "rdoc"
end
View
@@ -4,7 +4,6 @@ PATH
poolparty (1.7.0.pre)
amazon-ec2 (~> 0.9.17)
json
- poolparty
xml-simple
GEM
@@ -15,26 +14,21 @@ GEM
xml-simple (>= 1.0.12)
crack (0.1.8)
fakeweb (1.3.0)
- git (1.2.5)
git-style-binaries (0.1.11)
shoulda
trollop
- jeweler (1.6.2)
- bundler (~> 1.0)
- git (>= 1.2.5)
- rake
jnunemaker-matchy (0.4.0)
- json (1.5.1)
+ json (1.5.3)
mocha (0.9.12)
- rake (0.9.1)
rcov (0.9.9)
+ rdoc (3.9.4)
right_http_connection (1.3.0)
shoulda (2.11.3)
trollop (1.16.2)
webmock (1.6.4)
addressable (~> 2.2, > 2.2.5)
crack (>= 0.1.7)
- xml-simple (1.0.16)
+ xml-simple (1.1.0)
PLATFORMS
ruby
@@ -43,12 +37,12 @@ DEPENDENCIES
amazon-ec2 (~> 0.9.17)
fakeweb
git-style-binaries
- jeweler
jnunemaker-matchy (~> 0.4.0)
json
mocha
poolparty!
rcov
+ rdoc
right_http_connection
shoulda
webmock
View
@@ -1,18 +1,11 @@
$:.unshift(File.join(File.dirname(__FILE__), "."))
require 'rake'
+require "bundler/gem_tasks"
require 'rake/testtask'
require 'rdoc/task'
require 'config/requirements'
-begin
- require 'hanna/rdoctask'
-rescue LoadError => e
- require "rake/rdoctask"
-end
-
-require 'config/jeweler' # setup gem configuration
-
task :default => [:test, :cleanup_test]
desc "Update vendor directory and run tests"
@@ -79,8 +72,6 @@ end
namespace :gem do
- task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation
-
desc "Build the gem only if the tests pass"
task :test_then_build => [:test, :build]
View
@@ -1,5 +0,0 @@
----
-:major: 1
-:minor: 7
-:patch: 0
-:build: pre
View
@@ -1,39 +0,0 @@
-# You also need to setup your name and email for git if you haven't already done so.
-# Info at http://github.com/guides/tell-git-your-user-name-and-email-address
-
-begin
-class Array
- def one_of_regex
- option_list = join "|"
- Regexp.new "(#{option_list})"
- end
-end
- require 'rubygems'
- require 'jeweler'
- Jeweler::Tasks.new do |s|
- s.name = "poolparty"
- s.description = "PoolParty: The easy, open-source, cross-cloud management solution"
- s.summary = <<-EOM
- Simple DSL to describe and realize cloud deployment architectures.
- EOM
-
- s.homepage = "http://poolpartyrb.com"
- s.email = "arilerner@mac.com"
- s.authors = ["Ari Lerner", "Michael Fairchild", "Nate Murray"]
-
- s.test_files = Dir["test/**/test_*.rb"]
-
- s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"])
- # s.files.exclude "**/*/erl_crash.dump"
-
- s.require_paths = ["lib"]
- s.rdoc_options = ['--quiet', '--title', 'PoolParty documentation',
- # "index.html",
- "--line-numbers",
- "--main", "README.rdoc"
- ]
-
- end
-rescue LoadError
- puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gems.github.com"
-end
@@ -132,7 +132,7 @@ def system_run(cmd, o={})
opts = {:quiet => false, :sysread => 1024}.merge(o)
buf = ""
# puts("Running command: #{cmd}")
- Open3.popen3(cmd) do |stdout, stdin, stderr|
+ status = Open3.popen3(cmd) do |stdout, stdin, stderr, wait_thr|
begin
while (chunk = stdin.readpartial(opts[:sysread]))
buf << chunk
@@ -152,8 +152,9 @@ def system_run(cmd, o={})
$stderr.write_nonblock(err)
# used to do nothing
end
+ wait_thr.value
end
- unless $?.success?
+ unless status.success?
warn "Failed sshing. Check ~/.poolparty/ssh.log for details"
end
buf
View
@@ -27,15 +27,14 @@
require dep
end
+require "poolparty/version"
module PoolParty
def self.version
- return @version if @version
- config = ::YAML.load(File.read(File.expand_path("#{File.dirname(__FILE__)}/../VERSION.yml")))
- @version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
- @version += "-" + config[:build] if config[:build]
+ VERSION
end
+
def self.lib_dir
- File.join(File.dirname(__FILE__), "..")
+ File.join(File.dirname(__FILE__), "..")
end
end
View
@@ -0,0 +1,3 @@
+module PoolParty
+ VERSION = "1.7.0.pre"
+end
Oops, something went wrong.

0 comments on commit fd810ef

Please sign in to comment.