slugbuilder 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc40a6d4591cdf1c3d38112e9d1bc4bde1012687
-  data.tar.gz: '0102491f9b95b694905db3e7876d588a2e067f62'
+  metadata.gz: eeaac445621a0c0521008a3b7e92ef3a0faca8fa
+  data.tar.gz: 859fe6152e81018f187c89887e51015960610513
 SHA512:
-  metadata.gz: f64bcd5db7366dadd1f09d63a2a61a441ace5de3020a3827d5b60a0e39ce09e577eb6c600db871434038c21de73901794dde097b34b2185eac601719bf723659
-  data.tar.gz: f41a21fd11a8196aa2b2fd46f6f2197a7641ba11e6afb18092c5902a691d78b8054d2b721a86814604cc14015e85d6884a3b79a762b5410c5b6932f8ee316d34
+  metadata.gz: 15010197f5d99b3e1cf48fed3c5556a86349dfd9aebd74eba2caf5925cc8dd1f041601bed45db94ff09e8588043a6901e90e68ce870c4a74b3e78d92e7766818
+  data.tar.gz: 65273d2387626c01a8ac718c731635b02ead2c5624d0bf89adcc7d719df5bc7893d69b2e8b9e85dfb66a8bf454ba80ef6708b46674a87c00435c2937e06bf244

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.1 (2017-5-25)
+
+Fixed:
+
+- Get force pushed changes from buildpack branches. [b976393](../../commit/b976393)
+
 ## 2.0.0 (2017-5-3)
 
 Changed:

data/README.md

@@ -101,7 +101,7 @@ Alternatively, a Proc can be passed to `build` method's keyword argument `prebui
 - `slug_name` String (optional): Override default name of slug (repo.git_ref.git_sha.tgz with the `/` in repo replaced by `.`)
 - `clear_cache` Boolean (optional): destroys the cache before building when true
 - `env` Hash (optional): an optional hash of environment variables
-- `buildpacks` Array (optional): optionally set buildpacks to be used for that particular build. defaults to `Slugbuilder.config.buildpacks`
+- `buildpacks` Array (optional): optionally set buildpacks to be used for that particular build. defaults to `Slugbuilder.config.buildpacks`. Buildpacks should be in the form `<organization>/<repository_name>`, `https://<git_service>/<organization>/<repository_name>.git`, or `git@<git_service>:<organization>/<repository_name>.git`
 - `prebuild` Proc (optional): an optional Proc (or anything that conforms to the `call` API of a Proc) that will be run before the build. The Proc will receive a Hash with the structure:
   - `repo` String: The git repo identifier
   - `git_ref` String: The git branchname or SHA
@@ -185,7 +185,7 @@ The protocol that should be used to pull down git repositories (including buildb
 
 **buildpacks**
 
-Buildpacks is an array of valid git clone-able [buildpack](https://devcenter.heroku.com/articles/buildpacks) URLs.
+Buildpacks is an array of valid git clone-able [buildpack](https://devcenter.heroku.com/articles/buildpacks) URLs. Buildpacks should be in the form `<organization>/<repository_name>`, `https://<git_service>/<organization>/<repository_name>.git`, or `git@<git_service>:<organization>/<repository_name>.git`
 
 > Defaults to []
 

data/lib/slugbuilder/builder.rb

@@ -188,7 +188,7 @@ module Slugbuilder
           # fetch latest
           stitle("Using cached buildpack. Ensuring latest version of buildpack: #{buildpack_name}")
           Dir.chdir("#{@buildpacks_dir}/#{buildpack_name}") do
-            rc = run('git pull --quiet')
+            rc = run('git reset origin --hard && git pull --quiet')
             fail "Failed to update: #{buildpack_name}" if rc != 0
           end
         end
@@ -196,7 +196,7 @@ module Slugbuilder
         # checkout hash
         if buildpack_matches[:hash]
           Dir.chdir("#{@buildpacks_dir}/#{buildpack_name}") do
-            rc = run("git fetch --quiet --all && git checkout --quiet #{buildpack_matches[:hash]}")
+            rc = run("git checkout --quiet #{buildpack_matches[:hash]} && git reset origin --hard && git pull --quiet")
             fail "Failed to fetch and checkout: #{buildpack_matches[:hash]}" if rc != 0
           end
         end

data/lib/slugbuilder/version.rb

@@ -1,3 +1,3 @@
 module Slugbuilder
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slugbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Panoply Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build Heroku-like slugs