heroku_hatchet 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ab96e76acbc9193b2bda5f8ac7ada60364008f2
+  data.tar.gz: 794c94bfde39543b8ac96e69321cca5fa9122680
+SHA512:
+  metadata.gz: f0be209eafbe2220d4685d373c34b96922e1b427312713e42deba1006954c95031adf3c4f91f72bf1b5cb776503128b05a6c4ad3bef0ef179b80e793507ea4eb
+  data.tar.gz: 9844f35fe14d22d00bc2448b209fe8f4754e8df48959b18a6efcaf4ad632d9d21b1b4db7e2b77c0bd4c30265c709521d7b99dc37cd147099e88a8ca1f849fa1d

data/.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 test/fixtures/repos/*
+*.gem
 
+
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.0.2
+
+- Added ability to run inline commands with no block (such as `app.run('ruby -v')`)
+
+## 0.0.1
+
+- Initial Release

data/README.md

@@ -78,6 +78,16 @@ you can configure the timeout by passing in a second parameter
     cmd.run("rake test", 180.seconds)
 
 
+## Running One off Commands
+
+If you only want to run one command you can call `app.run` without
+passing a block
+
+    Hatchet::AnvilApp.new("/codetriage").deploy do |app|
+      assert_match "1.9.3", app.run("ruby -v")
+    end
+
+
 ## Testing A Different Buildpack
 
 You can specify buildpack to deploy with like so:

data/Rakefile

@@ -3,3 +3,5 @@ require 'bundler/gem_tasks'
 
 require 'hatchet/tasks'
 
+task :default => [:test]
+

data/bin/hatchet

@@ -19,11 +19,12 @@ class HatchetCLI < Thor
     warn_dot_ignore!
     puts "Installing repos for hatchet"
     dirs.each do |directory, git_repo|
+      directory = File.expand_path(directory)
       if Dir[directory].present?
-        puts "==  Detected #{git_repo} in #{directory}, pulling\n"
+        puts "== pulling '#{git_repo}' into '#{directory}'\n"
         pull(directory, git_repo)
       else
-        puts "==  Did not find #{git_repo} in #{directory}, cloning\n"
+        puts "== cloning '#{git_repo}' into '#{directory}'\n"
         clone(directory, git_repo)
       end
     end
@@ -39,9 +40,12 @@ class HatchetCLI < Thor
   private
 
   def warn_dot_ignore!
+    return false unless File.exist?('.gitignore')
+
     gitignore = File.open('.gitignore').read
-    return if gitignore.include?(config.repo_directory_path)
-    puts "WARNING: add #{File.join(config.repo_directory_path, '*')} to your .gitignore file \n\n"
+    repo_path = config.repo_directory_path.gsub(/^\.\//, '') # remove ./ from front of dir
+    return if gitignore.include?(repo_path)
+    puts "WARNING: add #{File.join(repo_path, '*')} to your .gitignore file \n\n"
   end
 
   def config

data/hatchet.json

@@ -1,5 +1,5 @@
 {
   "hatchet": {"directory": "test/fixtures"},
-  "rails3": ["sharpstone/codetriage"],
+  "rails3": ["sharpstone/rails3_mri_193"],
   "rails2": ["sharpstone/rails2blog"]
 }

data/lib/hatchet/config.rb

@@ -72,7 +72,7 @@ module Hatchet
       set_internal_config!(config)
       config.each do |(directory, git_repos)|
         git_repos.each do |git_repo|
-          git_repo         = git_repo.include?("github.com") ? git_repo : "git@github.com:#{git_repo}.git"
+          git_repo         = git_repo.include?("github.com") ? git_repo : "git://github.com/#{git_repo}.git"
           repo_name        = name_from_git_repo(git_repo)
           repo_path        = File.join(repo_directory_path, directory, repo_name)
           if repos.key? repo_name

data/lib/hatchet/process_spawn.rb

@@ -5,7 +5,7 @@ module Hatchet
   class ProcessSpawn
     attr_reader :command, :app, :timeout
 
-    TIMEOUT = 20 # seconds to bring up a heroku command like `heroku run bash`
+    TIMEOUT = 60 # seconds to bring up a heroku command like `heroku run bash`
 
     def initialize(command, app, timeout = nil)
       @command = command
@@ -14,7 +14,7 @@ module Hatchet
     end
 
     def ready?
-      `heroku ps -a #{app.name}`.match(/^run.*up.*`#{command}`/).present?
+      @ready ||= `heroku ps -a #{app.name}`.match(/^run.*up.*#{command}/).present?
     end
 
     def not_ready?
@@ -34,16 +34,19 @@ module Hatchet
     def run(&block)
       raise "need app"     unless app.present?
       raise "need command" unless command.present?
-      output, input, pid = PTY.spawn("heroku run #{command} -a #{app.name}")
+      heroku_command     = "heroku run #{command} -a #{app.name}"
+      return `#{heroku_command}` if block.blank? # one off command, no block given
+
+      output, input, pid = PTY.spawn(heroku_command)
       stream = StreamExec.new(input, output)
       stream.timeout("waiting for spawn", timeout) do
         wait_for_spawn!
       end
-      raise "Could not run: #{command}" unless self.ready?
+      raise "Could not run: '#{command}', command took longer than #{timeout} seconds" unless self.ready?
       yield stream
     ensure
       stream.close                if stream.present?
       Process.kill('TERM', pid)   if pid.present?
     end
   end
-end
+end

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/fixtures/buildpacks/null-buildpack/hatchet.json

@@ -0,0 +1,4 @@
+{
+  "hatchet": {"directory": "../.."},
+  "rails3": ["sharpstone/rails3_mri_193"]
+}

data/test/hatchet/anvil_test.rb

@@ -2,20 +2,20 @@ require 'test_helper'
 
 class AnvilTest < Test::Unit::TestCase
   def test_deploy
-    Dir.chdir('test/fixtures/builpacks/null-buildpack') do
-      Hatchet::AnvilApp.new("codetriage",debug: true).deploy do |app|
-        assert true
-        app.run("bash") do |cmd|
-          # cmd.run("cd public/assets")
+    ruby_buildpack_path = File.expand_path 'test/fixtures/buildpacks/heroku-buildpack-ruby'
 
-          assert cmd.run("cat Gemfile").include?("gem 'pg'")
+    Hatchet::AnvilApp.new("rails3_mri_193", buildpack: ruby_buildpack_path).deploy do |app, heroku, output|
+      assert true
 
-          # deploying with null buildpack, no assets should be compiled
-          refute cmd.run("ls public/assets").include?("application.css")
-        end
+      assert_match '1.9.3', app.run("ruby -v")
+      app.run("bash") do |cmd|
+
+        assert cmd.run("cat Gemfile").include?("gem 'pg'")
+
+        assert cmd.run("ls public/assets").include?("application.css")
       end
+
     end
   end
 end
 
-

data/test/hatchet/config_test.rb

@@ -7,17 +7,17 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_config_path_for_name
-    assert_equal 'test/fixtures/repos/rails3/codetriage', @config.path_for_name('codetriage')
+    assert_equal 'test/fixtures/repos/rails3/rails3_mri_193', @config.path_for_name('rails3_mri_193')
   end
 
   def test_config_dirs
-    expected_dirs = { "test/fixtures/repos/rails3/codetriage" => "git@github.com:sharpstone/codetriage.git",
-                      "test/fixtures/repos/rails2/rails2blog" => "git@github.com:sharpstone/rails2blog.git" }
+    expected_dirs = { "test/fixtures/repos/rails3/rails3_mri_193" => "git://github.com/sharpstone/rails3_mri_193.git",
+                      "test/fixtures/repos/rails2/rails2blog" => "git://github.com/sharpstone/rails2blog.git" }
     assert_equal expected_dirs, @config.dirs
   end
 
   def test_config_repos
-    expected_repos = { "codetriage" => "test/fixtures/repos/rails3/codetriage",
+    expected_repos = { "rails3_mri_193" => "test/fixtures/repos/rails3/rails3_mri_193",
                        "rails2blog" => "test/fixtures/repos/rails2/rails2blog" }
     assert_equal expected_repos, @config.repos
   end
@@ -30,6 +30,7 @@ class ConfigTest < Test::Unit::TestCase
 
   def test_github_shortcuts
     @config.send :init_config!, {"foo" => ["schneems/sextant"]}
-    assert_equal("git@github.com:schneems/sextant.git", @config.dirs["./repos/foo/sextant"])
+    assert_equal("git://github.com/schneems/sextant.git", @config.dirs["./repos/foo/sextant"])
   end
 end
+

data/test/hatchet/git_test.rb

@@ -2,9 +2,10 @@ require 'test_helper'
 
 class TriageTest < Test::Unit::TestCase
   def test_foo
-    Hatchet::GitApp.new("codetriage").deploy do |app|
+    Hatchet::GitApp.new("rails3_mri_193").deploy do |app|
       assert true
-      assert app.deployed?
+      assert_match '1.9.3', app.run("ruby -v")
+
       app.run("bash") do |cmd|
         # cmd.run("cd public/assets")
         assert cmd.run("ls public/assets").include?("application.css")

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: anvil-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -116,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -132,11 +120,11 @@ files:
 - lib/hatchet/stream_exec.rb
 - lib/hatchet/tasks.rb
 - lib/hatchet/version.rb
-- test/fixtures/builpacks/null-buildpack/bin/compile
-- test/fixtures/builpacks/null-buildpack/bin/detect
-- test/fixtures/builpacks/null-buildpack/bin/release
-- test/fixtures/builpacks/null-buildpack/hatchet.json
-- test/fixtures/builpacks/null-buildpack/readme.md
+- test/fixtures/buildpacks/null-buildpack/bin/compile
+- test/fixtures/buildpacks/null-buildpack/bin/detect
+- test/fixtures/buildpacks/null-buildpack/bin/release
+- test/fixtures/buildpacks/null-buildpack/hatchet.json
+- test/fixtures/buildpacks/null-buildpack/readme.md
 - test/hatchet/anvil_test.rb
 - test/hatchet/config_test.rb
 - test/hatchet/git_test.rb
@@ -144,36 +132,34 @@ files:
 homepage: https://github.com/heroku/hatchet
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.
 test_files:
-- test/fixtures/builpacks/null-buildpack/bin/compile
-- test/fixtures/builpacks/null-buildpack/bin/detect
-- test/fixtures/builpacks/null-buildpack/bin/release
-- test/fixtures/builpacks/null-buildpack/hatchet.json
-- test/fixtures/builpacks/null-buildpack/readme.md
+- test/fixtures/buildpacks/null-buildpack/bin/compile
+- test/fixtures/buildpacks/null-buildpack/bin/detect
+- test/fixtures/buildpacks/null-buildpack/bin/release
+- test/fixtures/buildpacks/null-buildpack/hatchet.json
+- test/fixtures/buildpacks/null-buildpack/readme.md
 - test/hatchet/anvil_test.rb
 - test/hatchet/config_test.rb
 - test/hatchet/git_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/test/fixtures/builpacks/null-buildpack/hatchet.json

@@ -1,5 +0,0 @@
-{
-  "hatchet": {"directory": "../.."},
-  "rails3": ["sharpstone/codetriage"],
-  "rails2": ["sharpstone/rails2blog"]
-}