Skip to content
Browse files

merge

  • Loading branch information...
2 parents 44a8aa1 + 8cca91d commit cf1d213b8904f23cc6f471854e3bb3e6cc41eed9 @markryall committed Mar 24, 2012
Showing with 34 additions and 21 deletions.
  1. +21 −12 Gemfile.lock
  2. +7 −0 Guardfile
  3. +2 −6 Rakefile
  4. +0 −1 autotest/discover.rb
  5. +4 −2 shh.gemspec
View
33 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- shh (0.2.1)
+ shh (0.3.0)
activesupport (~> 3)
crypt19 (~> 1)
flat_hash (~> 0)
@@ -14,37 +14,46 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.2.1)
+ activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
crypt19 (1.2.1)
diff-lcs (1.1.3)
+ ffi (1.0.11)
flat_hash (0.1.0)
grit (~> 2)
grit (2.4.1)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
+ guard (1.0.1)
+ ffi (>= 0.5.0)
+ thor (~> 0.14.6)
+ guard-rspec (0.6.0)
+ guard (>= 0.10.0)
highline (1.6.11)
i18n (0.6.0)
- mime-types (1.17.2)
+ mime-types (1.18)
multi_json (1.1.0)
rake (0.9.2.2)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
shell_shock (0.0.5)
splat (0.1.4)
+ thor (0.14.6)
uuidtools (2.1.2)
PLATFORMS
ruby
DEPENDENCIES
- rake (~> 0.8)
+ guard
+ guard-rspec
+ rake
rspec (~> 2)
shh!
View
7 Guardfile
@@ -0,0 +1,7 @@
+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" }
+ watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
+end
+
View
8 Rakefile
@@ -1,10 +1,6 @@
-begin
- require 'gemesis/rake'
-rescue Exception
- puts "gemesis related tasks will only be available if you 'gem install gemesis'"
-end
+require 'bundler/gem_tasks'
desc 'execute specifications'
task :test do
sh 'rspec spec'
-end
+end
View
1 autotest/discover.rb
@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }
View
6 shh.gemspec
@@ -1,7 +1,7 @@
Gem::Specification.new do |spec|
spec.name = 'shh'
- spec.version = '0.2.1'
+ spec.version = '0.3.0'
spec.summary = "command line utility for managing secure information"
spec.description = <<-EOF
A command line utility that manages accounts and passwords as individual encypted files
@@ -23,6 +23,8 @@ EOF
spec.add_dependency 'i18n', '~>0'
spec.add_dependency 'crypt19', '~>1'
- spec.add_development_dependency 'rake', '~>0.8'
+ spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec', '~>2'
+ spec.add_development_dependency 'guard'
+ spec.add_development_dependency 'guard-rspec'
end

0 comments on commit cf1d213

Please sign in to comment.
Something went wrong with that request. Please try again.