Merge pull request #388 from scottdavis/rubygemcli

Rubygemcli

octopress/.rbenv-version

@@ -0,0 +1 @@
+1.9.2-p290

octopress/.rspec

@@ -0,0 +1 @@
+--color

octopress/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2

octopress/Gemfile

@@ -1,5 +1,22 @@
 source :rubygems
 gemspec
 
-gem 'fakefs', git:'git://github.com/defunkt/fakefs.git'
-gem 'ruby-debug19'
+group :debug do
+  gem 'ruby-debug19'
+end
+
+group :test do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-cucumber'
+
+  gem 'fakefs', git:'git://github.com/defunkt/fakefs.git'
+  
+  #if we are on travis ci ignore these
+  unless ENV["CI"]
+    gem 'rb-fsevent'
+    gem 'ruby_gntp', '~> 0.3.4'
+  end
+end
+
+

octopress/Guardfile

@@ -0,0 +1,17 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+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
+
+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

octopress/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 10
+  @aruba_timeout_seconds = 60
 end

octopress/octopress.gemspec

@@ -3,26 +3,33 @@ 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')
+  s.add_development_dependency('aruba', '~> 0.4.11')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rdoc')
+
 end