Merge branch 'release/0.0.9'

bogdanRada · Mar 16, 2015 · 0d06765 · 0d06765
2 parents ea7faae + 27e277a
commit 0d06765
Show file tree

Hide file tree

Showing 48 changed files with 414 additions and 612 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ Gemfile.lock
 /.git-rewrite/
 .yardoc/
 doc/
+bin/
diff --git a/Rakefile b/Rakefile
@@ -3,6 +3,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 require 'yard'
+require 'yard-rspec'
 Coveralls::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -16,10 +17,12 @@ end
 #  Dummy::Application.load_tasks
 #  Rake::Task["db:test:prepare"].invoke
 # end
+YARD::Config.options[:load_plugins] = true
+YARD::Config.load_plugins
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/**/*.rb'] # optional
-  t.options = ['--any', '--extra', '--opts', '--markup-provider=redcarpet', '--markup=markdown'] # optional
+  t.files = ['lib/**/*.rb', 'spec/**/*_spec.rb'] # optional
+  t.options = ['--any', '--extra', '--opts', '--markup-provider=redcarpet', '--markup=markdown', '--debug'] # optional
   t.stats_options = ['--list-undoc'] # optional
 end
 
@@ -44,7 +47,7 @@ task :all do |_t|
   if ENV['TRAVIS']
     exec(' bundle exec phare &&  bundle exec rake  spec && bundle exec rake coveralls:push')
   else
-    exec('bundle exec phare && bundle exec rake spec')
+    exec('bundle exec rubocop -a . && bundle exec phare && bundle exec rake spec')
   end
 end
 

diff --git a/bin/appraisal b/bin/appraisal
diff --git a/bin/autospec b/bin/autospec
diff --git a/bin/bundler b/bin/bundler
diff --git a/bin/cdiff b/bin/cdiff
diff --git a/bin/coderay b/bin/coderay
diff --git a/bin/colortab b/bin/colortab
diff --git a/bin/coveralls b/bin/coveralls
diff --git a/bin/decolor b/bin/decolor
diff --git a/bin/erubis b/bin/erubis
diff --git a/bin/guard b/bin/guard
diff --git a/bin/htmldiff b/bin/htmldiff
diff --git a/bin/inch b/bin/inch
diff --git a/bin/ldiff b/bin/ldiff
diff --git a/bin/listen b/bin/listen
diff --git a/bin/nokogiri b/bin/nokogiri
diff --git a/bin/phare b/bin/phare
diff --git a/bin/pry b/bin/pry
diff --git a/bin/rackup b/bin/rackup
diff --git a/bin/rails b/bin/rails
diff --git a/bin/rake b/bin/rake
diff --git a/bin/restclient b/bin/restclient