bard 0.10.0 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.10.0"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
-  s.date = %q{2010-07-22}
+  s.date = %q{2010-07-26}
   s.default_executable = %q{bard}
   s.description = %q{This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.}
   s.email = %q{info@botandrose.com}
@@ -50,7 +50,9 @@ Gem::Specification.new do |s|
      "lib/bard/template.rb",
      "lib/bard/template/adva.rb",
      "lib/bard/template/authlogic.rb",
+     "lib/bard/template/compass.rb",
      "lib/bard/template/exception_notifier.rb",
+     "lib/bard/template/gems.rb",
      "lib/bard/template/helper.rb",
      "lib/bard/template/initial.rb",
      "lib/bard/template/static_pages.rb",

data/lib/bard/template.rb

@@ -2,8 +2,8 @@
 # bot and rose design rails template
 require "bard/template/helper"
 
-%w(initial testing exception_notifier static_pages adva).each do |template_file|
+%w(initial gems compass testing exception_notifier static_pages adva).each do |template_file|
   bard_load_template template_file
 end
-run "cd #{project_name}"
+system "cd #{project_name}"
 puts "Project #{project_name} created! Ask Micah to set up staging server."

data/lib/bard/template/compass.rb

@@ -0,0 +1,140 @@
+run "compass init rails . --sass-dir=app/stylesheets --css-dir public/stylesheets"
+
+file "app/stylesheets/application.sass", <<-END
+@import "constant"
+
+@import "blueprint"
+@import "compass/reset"
+@import "compass/utilities"
+@import "compass/layout"
+ 
+=blueprint($body_selector = "body")
+  +blueprint-typography($body_selector)
+  +blueprint-utilities
+  +blueprint-debug
+  +blueprint-interaction
+  +blueprint-colors
+  
+@import "general"
+END
+
+file "app/stylesheets/_constant.sass", <<-END
+$blueprint_grid_columns: 24
+$blueprint_grid_width: 30px
+$blueprint_grid_margin: 10px
+
+$primaryColor: blue
+
+=box-shadow( $blur, $color )
+  -moz-box-shadow: 0px 0px $blur $color
+  -webkit-box-shadow: 0px 0px $blur $color
+=text-shadow($px, $color)
+  text-shadow: 0px 0px $px $color
+=border-radius( $radius )
+  -moz-border-radius: $radius
+  -webkit-border-radius: $radius
+  border-radius: $radius
+=border-radius-specific( $location1, $location2, $radius )
+  -moz-border-radius-\#{$location1}\#{$location2}: $radius
+  -webkit-border-\#{$location1}-\#{$location2}-radius: $radius
+  border-\#{$location1}-\#{$location2}-radius: $radius
+END
+
+file "app/stylesheets/_general.sass", <<-END
+body
+  font: 13px normal Arial, sans-serif
+  color: #373737
+
+.bold, b, strong
+  font-weight: bold
+
+a
+  text-decoration: none
+  color: $primaryColor
+  img
+    border: 1px solid transparent
+
+p
+  margin: 12px 0
+  line-height: 1.4
+  text-align: justify
+
+ul, ol, li
+  margin: 0
+  padding: 0
+
+h1, h2, h3, h4, h5, h6
+  margin: 0
+  padding: 0
+
+h2, h3, h4
+  text-transform: uppercase
+
+h2, h3
+  color: black
+
+h2
+  font: 2em bold "Arial Black"
+  line-height: 1
+  a
+    color: black
+    &:hover
+      color: $primaryColor
+
+h3
+  font-weight: bold
+  font-size: 1.1em
+
+h4
+  font-size: 0.9em
+  border-bottom: 1px solid #3f3f3f
+  color: #3f3f3f
+  margin-bottom: 9px
+
+// tables
+
+table
+  border-collapse: none
+  margin-bottom: 6px
+  tr.even
+    background: #ebebeb
+  td
+    line-height: 1.25
+    vertical-align: top
+
+// forms
+
+.field
+  margin: 0px 0 10px
+
+label
+  display: inline-block
+  width: 120px
+  text-align: right
+  margin-right: 9px
+  &.reqd
+    font-weight: bold
+    font-style: normal
+  &.opt
+    color: #666666
+
+select
+  width: 130px
+
+input, select
+  &.sm
+    width: 60px
+  &.lg
+    width: 407px
+  &+label
+    width: auto
+    margin-left: 9px
+  &.radio
+    &+label
+      font-size: 1em
+      text-transform: inherit
+      color: #242424
+      margin-left: 0
+END
+
+run "compass compile"

data/lib/bard/template/gems.rb

@@ -0,0 +1,83 @@
+# Install .rvmrc
+run "rvm use ree-1.8.7-2010.02@#{project_name} --rvmrc --create"
+begin
+  require "rvm"
+  RVM.gemset_use! project_name
+rescue LoadError
+end
+
+# Install bundler files
+file "Gemfile", <<-END
+source "http://gemcutter.org"
+
+gem "rails", "2.3.5"
+gem "ruby-mysql"
+gem "bard-rake", :require => false
+gem "ruby-debug", :group => [:development, :test, :cucumber]
+
+gem "haml", "~>3.0"
+gem "compass", "~>0.10"
+
+group :test, :cucumber do
+  gem "autotest-rails"
+  gem "rspec-rails", "~>1.3", :require => false
+  gem "machinist"
+  gem "faker"
+end
+
+group :cucumber do
+  gem "cucumber-rails", :require => false
+  gem "webrat"
+  gem "database_cleaner"
+  gem "pickle"
+  gem "email_spec"
+end
+END
+run "bundle install --relock"
+
+file_inject "config/boot.rb", 
+"# All that for this:", <<-END, :before
+class Rails::Boot
+  def run
+    load_initializer
+
+    Rails::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Rails::Initializer.run(:set_load_path)
+  end
+end
+
+END
+
+file "config/preinitializer.rb", <<-END
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old." +
+    "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Install dependencies if needed
+  `bundle check`
+  system "bundle install" if not $?.success?
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end
+END
+
+file "config/setup_load_paths.rb", ""
+

data/lib/bard/template/initial.rb

@@ -13,12 +13,6 @@ plugin "acts_as_list", :git => "git://github.com/rails/acts_as_list.git"
 plugin 'asset_packager', :git => 'git://github.com/sbecker/asset_packager.git'
 #plugin 'fckeditor', :git => 'git://github.com/originofstorms/fckeditor.git'
  
-# Install gems
-gem "bard-rake", :version => ">=0.1.3"
-gem "haml", :version => "2.2.24"
-gem "compass", :version => "0.8.17"
-rake "gems:install"
-
 # Set up databases
 file "config/database.sample.yml", <<-END
 login: &login
@@ -81,60 +75,6 @@ file "app/views/layouts/application.html.haml", <<-END
     = yield :js
 END
 
-run "compass --rails --sass-dir app/sass --css-dir public/stylesheets ."
-
-# application.sass
-file "app/sass/application.sass", <<-END
-// global
-
-@import constant.sass
-
-@import blueprint.sass
-@import compass/reset.sass
-@import compass/utilities.sass
-@import compass/misc.sass
-@import compass/layout.sass
-@import blueprint/modules/buttons.sass
- 
-=blueprint(!body_selector = "body")
-  +blueprint-typography(!body_selector)
-  +blueprint-utilities
-  +blueprint-debug
-  +blueprint-interaction
-  +blueprint-colors
-  
-.left
-  +float-left
-.right
-  +float-right  
-  
-END
-
-# constant.sass
-file "app/sass/_constant.sass", <<-END
-// constant
-
-!blueprint_grid_columns = 24
-!blueprint_grid_width   = 30px
-!blueprint_grid_margin  = 10px
-
-=caps
-  :font-variant small-caps
-=box-shadow( !blur, !color )
-  :-moz-box-shadow= 0px 0px !blur !color
-=border-radius( !radius )
-  :-moz-border-radius= !radius
-  :-webkit-border-radius= !radius
-  :border-radius= !radius
-=auto
-  :display inline-block
-  +float-left
-  :width auto
-=bordering(!location, !color)
-  :border-\#{!location}= 1px solid !color 
-  
-END
-
 file "public/javascripts/application.js", <<-END
 $(function() {
 });
@@ -153,14 +93,13 @@ stylesheets:
   - ie
 END
 
-run "script/runner 'Sass::Plugin.options[:always_update] = true; Sass::Plugin.update_stylesheets'"
-
 plugin "input_css", :git => "git://github.com/rpheath/input_css.git"
 
 # Set up git repository
 run "touch tmp/.gitignore log/.gitignore vendor/.gitignore"
 run %{find . -type d -empty | grep -v "vendor" | grep -v ".git" | grep -v "tmp" | xargs -I xxx touch xxx/.gitignore}
 file '.gitignore', <<-END
+.bundle
 log/*.log
 tmp/*
 !tmp/.gitignore
@@ -199,4 +138,4 @@ git :commit => "-m'initial commit.'"
 git :checkout => "-b integration"
 
 git :remote => "add origin git@git.botandrose.com:#{project_name}.git"
-run "cap staging:bootstrap"
+# run "cap staging:bootstrap"

data/lib/bard/template/testing.rb

@@ -1,22 +1,9 @@
 require "bard/template/helper"
 
-# Testing Environment
-with_options :env => :cucumber, :lib => false do |env|
-  env.gem "cucumber",    :version => "0.4.3"
-  env.gem "webrat",      :version => "0.5.3"
-  env.gem "rspec",       :version => "1.2.9"
-  env.gem "rspec-rails", :version => "1.2.9"
-  env.gem "email_spec",  :version => "0.4.0"
-  env.gem "machinist",   :version => "1.0.6"
-  env.gem "pickle",      :version => "0.2.1"
-  env.gem "faker",       :version => "0.3.1"
-end
-rake "gems:install RAILS_ENV=cucumber"
-
 plugin "cucumber_rails_debug", :git => "git://github.com/mischa/cucumber_rails_debug"
 
 generate "rspec"
-generate "cucumber", "--skip"
+generate "cucumber"
 generate "email_spec"
 generate "pickle"
 
@@ -53,5 +40,5 @@ run "rake db:create RAILS_ENV=test"
 git :add => "."
 git :commit => "-m'added rspec and cucumber setups.'"
 
-run "cap stage"
-run "cap staging:bootstrap:ci"
+# run "cap stage"
+# run "cap staging:bootstrap:ci"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Micah Geisel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,7 +230,9 @@ files:
 - lib/bard/template.rb
 - lib/bard/template/adva.rb
 - lib/bard/template/authlogic.rb
+- lib/bard/template/compass.rb
 - lib/bard/template/exception_notifier.rb
+- lib/bard/template/gems.rb
 - lib/bard/template/helper.rb
 - lib/bard/template/initial.rb
 - lib/bard/template/static_pages.rb