From d6168442e816bf116361c4cbbe4911185ad9cd51 Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Thu, 19 Jan 2012 21:35:02 -0500 Subject: [PATCH 1/5] updated gemspec and added guard for continious tests --- octopress/.rbenv-version | 1 + octopress/.rvmrc | 1 + octopress/Gemfile | 19 ++++++++++++++++--- octopress/Guardfile | 15 +++++++++++++++ octopress/octopress.gemspec | 27 ++++++++++++++------------- 5 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 octopress/.rbenv-version create mode 100644 octopress/.rvmrc create mode 100644 octopress/Guardfile diff --git a/octopress/.rbenv-version b/octopress/.rbenv-version new file mode 100644 index 0000000..0a95b9f --- /dev/null +++ b/octopress/.rbenv-version @@ -0,0 +1 @@ +1.9.2-p290 diff --git a/octopress/.rvmrc b/octopress/.rvmrc new file mode 100644 index 0000000..35845a2 --- /dev/null +++ b/octopress/.rvmrc @@ -0,0 +1 @@ +rvm use 1.9.2 diff --git a/octopress/Gemfile b/octopress/Gemfile index 348421b..b347c59 100644 --- a/octopress/Gemfile +++ b/octopress/Gemfile @@ -1,4 +1,17 @@ -source :rubygems -gemspec +source 'http://rubygems.org' -gem 'ruby-debug19' +# The gems you'll need for generating your site on your development machine. +# The deployment strategy you use determines what you need in production, if +# anything. +# +group :development do + gem 'jekyll', '~> 0.11.0' + gem 'compass', '~> 0.11.0' +end + +# If your deployment target has you running Ruby, you might have some gems +# listed here. This will be the case if you deploy to Heroku. +# +group :production do + +end diff --git a/octopress/Guardfile b/octopress/Guardfile new file mode 100644 index 0000000..f7d6c52 --- /dev/null +++ b/octopress/Guardfile @@ -0,0 +1,15 @@ +# A sample Guardfile +# More info at https://github.com/guard/guard#readme + +guard 'rspec', :version => 2 do + watch(%r{^spec/.+_spec\.rb$}) + watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } + watch('spec/spec_helper.rb') { "spec" } +end + + +guard 'cucumber' do + watch(%r{^features/.+\.feature$}) + watch(%r{^features/support/.+$}) { 'features' } + watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' } +end diff --git a/octopress/octopress.gemspec b/octopress/octopress.gemspec index a9ec927..282115b 100644 --- a/octopress/octopress.gemspec +++ b/octopress/octopress.gemspec @@ -3,26 +3,27 @@ require File.join([File.dirname(__FILE__),'lib','octopress','version.rb']) spec = Gem::Specification.new do |s| s.name = 'octopress' s.version = Octopress::VERSION - s.author = 'Brandon Mathis' + s.author = ['Brandon Mathis', 'Adam Williams', 'Scott Davis'] s.email = 'brandon@imathis.com' s.homepage = 'http://octopress.org' s.platform = Gem::Platform::RUBY s.summary = 'Octopress is a framework designed for Jekyll, the blog aware static site generator powering Github Pages.' - s.files = %w( -bin/octopress - ) - s.require_paths << 'lib' + s.require_paths = %w(lib) s.has_rdoc = true s.extra_rdoc_files = ['README.rdoc','octopress.rdoc'] - s.rdoc_options << '--title' << 'octopress' << '--main' << 'README.rdoc' << '-ri' - s.bindir = 'bin' - s.executables << 'octopress' + s.rdoc_options = %w(--title octopress --main README.rdoc -ri) + s.executables = %w(octopress) + + + s.files = %w(Readme.rdoc TODO.txt Rakefile) + s.files += Dir["lib/**/*.*"] + s.files += Dir["bin/**/*.*"] + s.files -= Dir["spec/**/*"] + s.files -= Dir["features/**/*"] + + s.add_dependency('gli', '~> 1.4.0') s.add_dependency('jekyll', '~> 0.11.0') s.add_dependency('rubyzip', '~> 0.9.5') - s.add_development_dependency('rake') - s.add_development_dependency('rdoc') - s.add_development_dependency('fakefs') - s.add_development_dependency('webmock') - s.add_development_dependency('aruba', '0.4.11') + end From 1d562a5f6ae79048e319cf3fa93f582fac8e2c5f Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Thu, 19 Jan 2012 21:39:51 -0500 Subject: [PATCH 2/5] updated guardfile and reverted gemfile after doing something stupid --- octopress/Gemfile | 34 ++++++++++++++++++++-------------- octopress/Guardfile | 22 ++++++++++++---------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/octopress/Gemfile b/octopress/Gemfile index b347c59..accafec 100644 --- a/octopress/Gemfile +++ b/octopress/Gemfile @@ -1,17 +1,23 @@ -source 'http://rubygems.org' +source :rubygems +gemspec -# The gems you'll need for generating your site on your development machine. -# The deployment strategy you use determines what you need in production, if -# anything. -# -group :development do - gem 'jekyll', '~> 0.11.0' - gem 'compass', '~> 0.11.0' -end +gem 'rake' +gem 'rdoc' -# If your deployment target has you running Ruby, you might have some gems -# listed here. This will be the case if you deploy to Heroku. -# -group :production do +# group :debug do +# gem 'ruby-debug19' +# end -end +group :test do + gem 'guard' + gem 'guard-rspec' + gem 'guard-cucumber' + gem 'fakefs' + gem 'webmock' + gem 'aruba', '~> 0.4.11' + #if we are on travis ci ignore these + unless ENV["CI"] + gem 'rb-fsevent' + gem 'ruby_gntp', '~> 0.3.4' + end +end \ No newline at end of file diff --git a/octopress/Guardfile b/octopress/Guardfile index f7d6c52..6dca2fb 100644 --- a/octopress/Guardfile +++ b/octopress/Guardfile @@ -1,15 +1,17 @@ # A sample Guardfile # More info at https://github.com/guard/guard#readme - -guard 'rspec', :version => 2 do - watch(%r{^spec/.+_spec\.rb$}) - watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } - watch('spec/spec_helper.rb') { "spec" } +group :specs do + guard 'rspec', :version => 2 do + watch(%r{^spec/.+_spec\.rb$}) + watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } + watch('spec/spec_helper.rb') { "spec" } + end end - -guard 'cucumber' do - watch(%r{^features/.+\.feature$}) - watch(%r{^features/support/.+$}) { 'features' } - watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' } +group :cukes do + guard 'cucumber' do + watch(%r{^features/.+\.feature$}) + watch(%r{^features/support/.+$}) { 'features' } + watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' } + end end From f82a45cceb31e58e0c9e831e51d5a7242ddd18a4 Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Thu, 19 Jan 2012 21:42:35 -0500 Subject: [PATCH 3/5] .rspec --- octopress/.rspec | 1 + 1 file changed, 1 insertion(+) create mode 100644 octopress/.rspec diff --git a/octopress/.rspec b/octopress/.rspec new file mode 100644 index 0000000..5052887 --- /dev/null +++ b/octopress/.rspec @@ -0,0 +1 @@ +--color \ No newline at end of file From 18e279e6e9ca64a36d880c4bfa82b1cdaf095bbc Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Thu, 19 Jan 2012 21:42:58 -0500 Subject: [PATCH 4/5] made timeout longer was timeing out on my connection --- octopress/features/support/env.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octopress/features/support/env.rb b/octopress/features/support/env.rb index 452e179..628fd1f 100644 --- a/octopress/features/support/env.rb +++ b/octopress/features/support/env.rb @@ -1,5 +1,5 @@ require 'aruba/cucumber' Before do - @aruba_timeout_seconds = 10 + @aruba_timeout_seconds = 60 end From cfc3843e1b5a66be45eb13b056e617684330331b Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Fri, 20 Jan 2012 10:20:38 -0500 Subject: [PATCH 5/5] reverted gemspec and gemfile --- octopress/Gemfile | 12 +++--------- octopress/octopress.gemspec | 6 ++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/octopress/Gemfile b/octopress/Gemfile index accafec..2391d4b 100644 --- a/octopress/Gemfile +++ b/octopress/Gemfile @@ -1,20 +1,14 @@ source :rubygems gemspec -gem 'rake' -gem 'rdoc' - -# group :debug do -# gem 'ruby-debug19' -# end +group :debug do + gem 'ruby-debug19' +end group :test do gem 'guard' gem 'guard-rspec' gem 'guard-cucumber' - gem 'fakefs' - gem 'webmock' - gem 'aruba', '~> 0.4.11' #if we are on travis ci ignore these unless ENV["CI"] gem 'rb-fsevent' diff --git a/octopress/octopress.gemspec b/octopress/octopress.gemspec index 282115b..d693f5a 100644 --- a/octopress/octopress.gemspec +++ b/octopress/octopress.gemspec @@ -26,4 +26,10 @@ spec = Gem::Specification.new do |s| s.add_dependency('jekyll', '~> 0.11.0') s.add_dependency('rubyzip', '~> 0.9.5') + s.add_development_dependency('fakefs') + s.add_development_dependency('webmock') + s.add_development_dependency('aruba', '~> 0.4.11') + s.add_development_dependency('rake') + s.add_development_dependency('rdoc') + end