Skip to content

Commit

Permalink
Updated logo images and .travis configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyObtiva committed Mar 24, 2015
1 parent 8358329 commit 6e5296b
Show file tree
Hide file tree
Showing 8 changed files with 130 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
ruby-2.0.0-p247
ruby-2.2.1
18 changes: 7 additions & 11 deletions .travis.yml
Expand Up @@ -2,39 +2,35 @@ language: ruby
services:
- redis-server
rvm:
- 2.2.1
- 2.1.5
- 2.0.0
- 1.9.3
- 1.8.7
- ree
- jruby-18mode
- jruby-19mode
- rbx-2.1.1
- rbx-2.5.2
gemfile:
- Gemfile
- ruby187.Gemfile
matrix:
exclude:
- rvm: 2.2.1
gemfile: ruby187.Gemfile
- rvm: 2.1.5
gemfile: ruby187.Gemfile
- rvm: 2.0.0
gemfile: ruby187.Gemfile
- rvm: 1.9.3
gemfile: ruby187.Gemfile
- rvm: 1.8.7
gemfile: Gemfile
- rvm: 1.8.7
gemfile: ruby187.Gemfile
- rvm: ree
gemfile: Gemfile
- rvm: ree
gemfile: ruby187.Gemfile
- rvm: jruby-18mode
gemfile: Gemfile
- rvm: jruby-18mode
gemfile: ruby187.Gemfile
- rvm: jruby-19mode
gemfile: ruby187.Gemfile
- rvm: jruby-19mode
gemfile: Gemfile
- rvm: rbx-2.1.1
gemfile: Gemfile
- rvm: rbx-2.1.1
gemfile: ruby187.Gemfile
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,13 +1,13 @@
source 'http://rubygems.org'

gem 'deep_merge', '~> 1.0.0', :require => false #avoid loading into memory to use deep_merge only if Rails is unavailable
gem 'deep_merge', '~> 1.0.0', :require => false #avoid loading to use only if Rails is unavailable
gem 'redis', '~> 3.0.0', :require => false

group :development do
gem 'jeweler', '2.0.1'
gem 'rspec', '2.14.1'
end

group :test do
gem 'rspec', '2.14.1'
gem 'coveralls', '0.7.0', :require => false
end
77 changes: 43 additions & 34 deletions Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.3.5)
addressable (2.3.7)
builder (3.2.2)
coveralls (0.7.0)
multi_json (~> 1.3)
Expand All @@ -10,22 +10,27 @@ GEM
term-ansicolor
thor
deep_merge (1.0.1)
descendants_tracker (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
docile (1.1.3)
faraday (0.9.0)
docile (1.1.5)
domain_name (0.5.23)
unf (>= 0.0.5, < 1.0.0)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
git (1.2.6)
github_api (0.11.3)
git (1.2.9.1)
github_api (0.12.3)
addressable (~> 2.3)
descendants_tracker (~> 0.0.1)
descendants_tracker (~> 0.0.4)
faraday (~> 0.8, < 0.10)
hashie (>= 1.2)
hashie (>= 3.3)
multi_json (>= 1.7.5, < 2.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6.3)
oauth2
hashie (2.0.5)
highline (1.6.20)
hashie (3.4.0)
highline (1.7.1)
http-cookie (1.0.2)
domain_name (~> 0.5)
jeweler (2.0.1)
builder
bundler (>= 1.0)
Expand All @@ -35,46 +40,50 @@ GEM
nokogiri (>= 1.5.10)
rake
rdoc
json (1.8.1)
jwt (0.1.11)
multi_json (>= 1.5)
mime-types (2.1)
mini_portile (0.5.2)
multi_json (1.8.4)
jwt (1.4.1)
mime-types (2.4.3)
mini_portile (0.6.2)
multi_json (1.11.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth2 (0.9.3)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth2 (1.0.0)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (1.5.2)
rake (10.1.1)
rdoc (4.1.1)
json (~> 1.4)
rack (1.6.0)
rake (10.4.2)
rdoc (4.2.0)
redis (3.0.7)
rest-client (1.6.7)
mime-types (>= 1.16)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
simplecov (0.8.2)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.18.1)
tins (1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tins (1.3.5)
unf (0.1.4)
unf_ext
unf_ext (0.0.6)

PLATFORMS
ruby
Expand Down
4 changes: 1 addition & 3 deletions README.md
Expand Up @@ -7,9 +7,7 @@ Abstract Feature Branch

**As Featured In**

[![Factor 75](https://dzd6ppgm28vds.cloudfront.net/assets/logo-b190de0b423855600e216d490fc160ad.png)](https://www.factor75.com)..[![Character Business Card](https://characterbusinesscard.s3.amazonaws.com/assets/Character-Business-Card-Logo-Desktop-44eb97b18b0a100488ba9c322343b91a.png)](https://www.characterbusinesscard.com)..[![Early Shares](http://early-shares-assets-production.s3.amazonaws.com/assets/logo2x-67fadfc8bb942ba92cca60c464010f1f.png)](https://www.earlyshares.com)


[![Factor 75](https://raw.githubusercontent.com/AndyObtiva/abstract_feature_branch/master/img/Factor75-Logo.svg)](https://www.factor75.com)..[![Early Shares](https://raw.githubusercontent.com/AndyObtiva/abstract_feature_branch/master/img/EarlyShares-Logo.svg)](https://www.earlyshares.com)..[![Big Astronaut](https://raw.githubusercontent.com/AndyObtiva/abstract_feature_branch/master/img/BigAstronaut-Logo.png)](https://www.bigastronaut.com)

abstract_feature_branch is a Rails gem that enables developers to easily branch by abstraction as per this pattern:
http://paulhammant.com/blog/branch_by_abstraction.html
Expand Down
Binary file added img/BigAstronaut-Logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions img/EarlyShares-Logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6e5296b

Please sign in to comment.