Skip to content

Commit

Permalink
Add bitters during setup
Browse files Browse the repository at this point in the history
  • Loading branch information
kylefiedler committed Jun 9, 2014
1 parent 6ece3c4 commit 43aa620
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
13 changes: 11 additions & 2 deletions Gemfile.lock
Expand Up @@ -2,6 +2,7 @@ PATH
remote: .
specs:
suspenders (1.13.0)
bitters
bundler (~> 1.3)
rails (~> 4.1.0)

Expand Down Expand Up @@ -39,6 +40,13 @@ GEM
childprocess (>= 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
bitters (0.10.0)
bourbon (>= 3.2)
sass (>= 3.2)
thor
bourbon (4.0.2)
sass (~> 3.3)
thor
builder (3.1.4)
capybara (2.2.0)
mime-types (>= 1.16)
Expand Down Expand Up @@ -77,7 +85,7 @@ GEM
mini_portile (~> 0.5.0)
nokogiri (1.6.1-x86-mingw32)
mini_portile (~> 0.5.0)
polyglot (0.3.4)
polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
Expand Down Expand Up @@ -105,6 +113,7 @@ GEM
rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
sass (3.3.8)
sprockets (2.12.1)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -120,7 +129,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.0)
tzinfo (1.2.1)
thread_safe (~> 0.1)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -31,6 +31,7 @@ It includes application gems like:

* [Airbrake](https://github.com/airbrake/airbrake) for exception notification
* [Bourbon](https://github.com/thoughtbot/bourbon) for Sass mixins
* [Bitters](https://github.com/thoughtbot/bitters) for scaffold application styles
* [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
processing
* [Email Validator](https://github.com/balexand/email_validator) for email
Expand Down
4 changes: 4 additions & 0 deletions lib/suspenders/app_builder.rb
Expand Up @@ -247,6 +247,10 @@ def setup_stylesheets
'app/assets/stylesheets/application.css.scss'
end

def install_bitters
run "bitters install --path app/assets/stylesheets"
end

def gitignore_files
remove_file '.gitignore'
copy_file 'suspenders_gitignore', '.gitignore'
Expand Down
6 changes: 6 additions & 0 deletions lib/suspenders/generators/app_generator.rb
Expand Up @@ -31,6 +31,7 @@ def suspenders_customization
invoke :setup_coffeescript
invoke :configure_app
invoke :setup_stylesheets
invoke :install_bitters
invoke :copy_miscellaneous_files
invoke :customize_error_pages
invoke :remove_routes_comment_lines
Expand Down Expand Up @@ -134,6 +135,11 @@ def setup_stylesheets
build :setup_stylesheets
end

def install_bitters
say 'Install Bitters'
build :install_bitters
end

def setup_git
if !options[:skip_git]
say 'Initializing git'
Expand Down
1 change: 1 addition & 0 deletions suspenders.gemspec
Expand Up @@ -7,6 +7,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = Suspenders::RUBY_VERSION
s.add_dependency 'bundler', '~> 1.3'
s.add_dependency 'rails', '~> 4.1.0'
s.add_dependency 'bitters'
s.add_development_dependency 'aruba', '~> 0.5.2'
s.add_development_dependency 'cucumber', '~> 1.2'
s.authors = ['thoughtbot']
Expand Down
6 changes: 2 additions & 4 deletions templates/application.css.scss
@@ -1,8 +1,6 @@
@charset 'utf-8';

///////////////////////////////////////////////////////////////////////////////

@import 'bourbon';
@import 'base/grid-settings';
@import 'neat';

///////////////////////////////////////////////////////////////////////////////
@import 'base/base';

0 comments on commit 43aa620

Please sign in to comment.