Skip to content

Commit

Permalink
Cleaning up some dependencies and making getting prepped for proper r…
Browse files Browse the repository at this point in the history
…elease notes
  • Loading branch information
phallguy committed Mar 20, 2015
1 parent e654330 commit 0147142
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.2
2.2.1
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
See https://github.com/phallguy/shog/releases
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ source 'https://rubygems.org'
gemspec


gem 'guard', '~> 2.6.1'
gem 'guard', '~> 2.12.5'
gem 'spring'
gem 'byebug'
gem 'pry-byebug'
gem 'guard-rspec'
gem 'guard-spring'
gem 'fuubar', github: 'thekompanee/fuubar'
gem 'fuubar'
gem 'foreman'
gem 'yard'
gem 'redcarpet'
Expand Down
27 changes: 14 additions & 13 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
guard :rspec do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
watch('spec/support/*.rb') { "spec" }
guard :rspec, cmd: "bundle exec rspec" do
require "guard/rspec/dsl"
dsl = Guard::RSpec::Dsl.new(self)

# Rails example
watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
watch('config/routes.rb') { "spec/routing" }
watch('app/controllers/application_controller.rb') { "spec/controllers" }
end
# Feel free to open issues for suggestions and improvements

# RSpec files
rspec = dsl.rspec
watch(rspec.spec_helper) { rspec.spec_dir }
watch(rspec.spec_support) { rspec.spec_dir }
watch(rspec.spec_files)

# Ruby files
ruby = dsl.ruby
dsl.watch_spec_files_for(ruby.lib_files)
end
2 changes: 1 addition & 1 deletion lib/shog/formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def formatted_severity_tag( severity )
# Formats a time value expressed in ms, adding color to highlight times
# outside the expected range.
#
# If `time` is more thatn `expected` it's highligted yellow. If it's more
# If `time` is more than `expected` it's highlighted yellow. If it's more
# than double it's highlighted red.
#
# @param [String] time in ms.
Expand Down
2 changes: 1 addition & 1 deletion lib/shog/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Shog
VERSION_NUMBER = "0.1.3"
VERSION_NUMBER = "0.1.4"
VERSION_SUFFIX = ""
VERSION = "#{VERSION_NUMBER}#{VERSION_SUFFIX}"
end

0 comments on commit 0147142

Please sign in to comment.