heroku_hatchet 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6494838495fd48c9286d2854cca1a316326b09c4
-  data.tar.gz: d54287274ec3208678d4f8799e14891f9169e7a0
+  metadata.gz: 624b9d562e3098c7bf2cbb4a278e99bcdb04924d
+  data.tar.gz: a202f59856e101fcacd81a63f3017a1856e2a100
 SHA512:
-  metadata.gz: 418375c35f800dd22a22cd12ed614c95f1e9c6221f7116c47dd5cf61cd6da1388df00746f1871f5579c880c1c498175681bb8611ac94daab5f6b4fc06ebfa463
-  data.tar.gz: d0cf46cef54024e94158d69273d3dedf4cbd2990897dac18eb01e4e803acc45a498412c20d59685aeb0813f6c55b80fc5e9745a6db7b555b19b98ad2f0ae5561
+  metadata.gz: 3385a90eb29b21c89255bac6704fcbc2786dba4a22b3e709edc11bdc21bc792579858a762d15915c0025a85c8b4bf11bbe9bb0d07e3b7720a0530d924d8ade9d
+  data.tar.gz: e72381640b7c5b6a9427854586b87671c43786a9d02125e2ddbeec0b049b5e9604f296e6c63142104cfdf62fd32ddef68df5cd6d15fb4c7d9189753a722aa867

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## HEAD
 
+## 1.3.0
+
+- `hatchet install` now clones and pulls in parallel threads
+- `rake travis:setup` now ensures a git email and name is set
+
 ## 1.2.1
 
 - Remove debug puts

data/bin/hatchet

@@ -12,22 +12,25 @@ $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
 require 'hatchet'
 require 'thor'
+require 'threaded'
 
 class HatchetCLI < Thor
   desc "install", "installs repos defined in 'hatchet.json'"
   def install
     warn_dot_ignore!
     puts "Installing repos for hatchet"
-    dirs.each do |directory, git_repo|
-      directory = File.expand_path(directory)
-      if Dir[directory].present?
-        puts "== pulling '#{git_repo}' into '#{directory}'\n"
-        pull(directory, git_repo)
-      else
-        puts "== cloning '#{git_repo}' into '#{directory}'\n"
-        clone(directory, git_repo)
+    dirs.map do |directory, git_repo|
+      Threaded.later do
+        directory = File.expand_path(directory)
+        if Dir[directory].present?
+          puts "== pulling '#{git_repo}' into '#{directory}'\n"
+          pull(directory, git_repo)
+        else
+          puts "== cloning '#{git_repo}' into '#{directory}'\n"
+          clone(directory, git_repo)
+        end
       end
-    end
+    end.map(&:join)
   end
 
   desc "list", "lists all repos and their destination listed in hatchet.json"
@@ -61,17 +64,13 @@ class HatchetCLI < Thor
   end
 
   def pull(path, git_repo)
-    Dir.chdir(path) do
-      `git pull --rebase #{git_repo} master`
-    end
+    `cd #{path} && git pull --rebase #{git_repo} master`
   end
 
   def clone(path, git_repo)
     path = File.join(path, '..') # up one dir to prevent repos/codetriage/codetriage/#...
-    FileUtils.mkdir_p(path)      # create directory
-    Dir.chdir(path) do
-      `git clone #{git_repo}`
-    end
+    FileUtils.mkdir_p(path)
+    `cd #{path} && git clone #{git_repo}`
   end
 end
 

data/hatchet.gemspec

@@ -18,17 +18,18 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "heroku-api"
-  gem.add_dependency "activesupport"
-  gem.add_dependency "rrrretry"
-  gem.add_dependency "anvil-cli"
-  gem.add_dependency "excon"
-  gem.add_dependency "thor"
-  gem.add_dependency 'repl_runner'
+  gem.add_dependency "heroku-api",    "~> 0"
+  gem.add_dependency "activesupport", "~> 3"
+  gem.add_dependency "rrrretry",      "~> 0"
+  gem.add_dependency "anvil-cli",     "~> 0"
+  gem.add_dependency "excon",         "~> 0"
+  gem.add_dependency "thor",          "~> 0"
+  gem.add_dependency "repl_runner",   "~> 0"
+  gem.add_dependency "threaded",      "~> 0"
 
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "mocha"
-  gem.add_development_dependency "parallel_tests"
+  gem.add_development_dependency "rake",           "~> 0"
+  gem.add_development_dependency "mocha",          "~> 0"
+  gem.add_development_dependency "parallel_tests", "~> 0"
 end
 

data/lib/hatchet/tasks.rb

@@ -13,14 +13,16 @@ namespace :hatchet do
     puts "== Setting Up Travis =="
     [
      "bundle exec hatchet install",
+     "if [ `git config --get user.email` ]; then echo 'already set'; else `git config --global user.email 'buildpack@example.com'`; fi",
+     "if [ `git config --get user.name` ];  then echo 'already set'; else `git config --global user.name  'BuildpackTester'`      ; fi",
      "echo '#{config_ssh}' >> ~/.ssh/config",
      "curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://toolbelt.heroku.com/install-ubuntu.sh | sh",
      "yes | heroku keys:add"
     ].each do |command|
       puts "== Running: #{command}"
       Bundler.with_clean_env do
-        `#{command}`
-        raise "Command failed: #{command.inspect}" unless $?.success?
+        result = `#{command}`
+        raise "Command failed: #{command.inspect}\nResult: #{result}" unless $?.success?
       end
     end
     puts "== Done =="
@@ -32,4 +34,5 @@ namespace :hatchet do
       `#{command}`
     end
   end
-end
+end
+

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/hatchet/edit_repo_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class EditRepoTest < Test::Unit::TestCase
+  def test_can_deploy_git_app
+    Hatchet::GitApp.new("rails3_mri_193").in_directory do |app|
+      msg = `touch foo`
+      assert $?.success?, msg
+
+      msg = `git add .; git commit -m foo`
+      assert $?.success?, msg
+
+      assert_match "foo", `ls`
+    end
+
+    Hatchet::GitApp.new("rails3_mri_193").in_directory do |app|
+      refute_match "foo", `ls`
+    end
+  end
+end
+

metadata

@@ -1,153 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rrrretry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: anvil-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: repl_runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: threaded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Hatchet is a an integration testing library for developing Heroku buildpacks.
@@ -215,6 +229,7 @@ files:
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/anvil_test.rb
 - test/hatchet/config_test.rb
+- test/hatchet/edit_repo_test.rb
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb
@@ -286,6 +301,7 @@ test_files:
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/anvil_test.rb
 - test/hatchet/config_test.rb
+- test/hatchet/edit_repo_test.rb
 - test/hatchet/git_test.rb
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb