approvals 0.0.5 → 0.0.6

data/.travis.yml

@@ -2,4 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - rbx-19mode
+
 script: bundle exec rspec spec

data/approvals.gemspec

@@ -1,9 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require 'approvals/version'
+
 Gem::Specification.new do |s|
   s.name        = "approvals"
-  s.version     = "0.0.5"
+  s.version     = Approvals::VERSION
   s.authors     = ["Katrina Owen"]
   s.email       = ["katrina.owen@gmail.com"]
   s.homepage    = ""
@@ -18,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'rspec', '~> 2.9'
+  s.add_development_dependency 'json'
   s.add_dependency 'thor'
   s.add_dependency 'nokogiri'
 end

data/lib/approvals.rb

@@ -1,5 +1,7 @@
+require 'json'
 require 'fileutils'
 require 'nokogiri'
+require 'approvals/version'
 require 'approvals/configuration'
 require 'approvals/approval'
 require 'approvals/dsl'

data/lib/approvals/rspec.rb

@@ -1,3 +1,4 @@
- require 'approvals/extensions/rspec'
+require 'approvals'
+require 'approvals/extensions/rspec'
 
 

data/lib/approvals/utilities/cli.rb

@@ -4,8 +4,8 @@ module Approvals
   class CLI < Thor
 
     desc "verify", "Go through all failing approvals with a diff tool"
-    method_option :diff, :type => :string, :default => 'vimdiff', :aliases => '-d', :desc => 'The difftool to use'
-    method_option :ask, :type => :boolean, :default => false, :aliases => "-a", :desc => 'Offer to approve the received file for you.'
+    method_option :diff, :type => :string, :default => 'diff', :aliases => '-d', :desc => 'The difftool to use. e.g. opendiff, vimdiff, etc.'
+    method_option :ask, :type => :boolean, :default => true, :aliases => "-a", :desc => 'Offer to approve the received file for you.'
     def verify
       approvals = File.read('.approvals').split("\n")
 

data/lib/approvals/utilities/executable.rb

@@ -8,6 +8,10 @@ module Approvals
     end
 
     def to_s
+      inspect
+    end
+
+    def inspect
       command
     end
   end

data/lib/approvals/version.rb

@@ -0,0 +1,3 @@
+module Approvals
+  VERSION = '0.0.6'
+end

data/lib/approvals/writers/json_writer.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module Approvals
   module Writers
     class JsonWriter < TextWriter

data/spec/approvals_spec.rb

@@ -6,7 +6,10 @@ describe Approvals do
   let(:namer) { Approvals::Namers::RSpecNamer.new(self.example) }
 
   it "fails" do
-    ->{ Approvals.verify "this one doesn't exist", :namer => namer }.should raise_error Approvals::ApprovalError
+    Approvals::Dotfile.stub(:path => '/dev/null')
+    lambda {
+      Approvals.verify "this one doesn't exist", :namer => namer
+    }.should raise_error Approvals::ApprovalError
   end
 
   it "verifies a string" do

data/spec/extensions/rspec_approvals_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'approvals/rspec'
 
 shared_context 'verify examples' do

data/spec/namers/default_namer_spec.rb

@@ -29,7 +29,7 @@ describe Approvals::Namers::DefaultNamer do
   end
 
   it "must have a name" do
-    ->{ Approvals::Namers::DefaultNamer.new(nil) }.should raise_error(ArgumentError)
+    lambda { Approvals::Namers::DefaultNamer.new(nil) }.should raise_error(ArgumentError)
   end
 
 end

data/spec/namers/directory_namer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'approvals/rspec'
 
 describe Approvals::Namers::DirectoryNamer do
 

data/spec/namers_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'approvals/rspec'
 
 describe Approvals::Namers do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114913577820 !ruby/object:Gem::Requirement
+  requirement: &70197693976720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70114913577820
+  version_requirements: *70197693976720
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70197693976000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70197693976000
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70114913577220 !ruby/object:Gem::Requirement
+  requirement: &70197693975480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114913577220
+  version_requirements: *70197693975480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70114913576740 !ruby/object:Gem::Requirement
+  requirement: &70197693975040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114913576740
+  version_requirements: *70197693975040
 description: Approval Tests for Ruby
 email:
 - katrina.owen@gmail.com
@@ -89,6 +100,7 @@ files:
 - lib/approvals/utilities/executable.rb
 - lib/approvals/utilities/scrubber.rb
 - lib/approvals/utilities/system_command.rb
+- lib/approvals/version.rb
 - lib/approvals/writer.rb
 - lib/approvals/writers/array_writer.rb
 - lib/approvals/writers/hash_writer.rb