subcheat 0.3.0 → 0.4.0

data/.gitignore

@@ -1,21 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
 coverage
-rdoc
+doc
 pkg
-
-## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    subcheat (0.4.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.5.1)
+      json (>= 1.4.6)
+    json (1.6.1)
+    metaclass (0.0.1)
+    minitest (2.6.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rdoc (3.9.4)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    term-ansicolor (1.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  minitest
+  mocha (>= 0.9.8)
+  rake
+  rdoc (~> 3.9)
+  simplecov
+  subcheat!

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Arjan van der Gaag
+Copyright (c) 2009-2011 Arjan van der Gaag
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -19,6 +19,7 @@ Subcheat is a simple wrapper around Subversion's svn command-line client.
 * <tt>subcheat root</tt>: output the current project root folder
 * <tt>subcheat path</tt>: output the current path in the repository
 * <tt>subcheat revision</tt>: output the current revision number
+* <tt>subcheat pretty-log</tt>: output friendly single-line logs
 
 Also, some existing subcommands are enhanced:
 
@@ -93,4 +94,4 @@ It might some day be made more flexible, but this works for me right now.
 
 == Copyright
 
-Copyright (c) 2009 Arjan van der Gaag. See LICENSE for details.
+Copyright (c) 2009 Arjan van der Gaag. See LICENSE for details.

data/Rakefile

@@ -1,66 +1,27 @@
-require 'rubygems'
-require 'rake'
+require 'bundler/gem_tasks'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "subcheat"
-    gem.summary = %Q{Wrapper for Subversion CLI}
-    gem.description = %Q{Wrap the Subversion CLI to extract some usage patterns into commands}
-    gem.email = "arjan@arjanvandergaag.nl"
-    gem.homepage = "http://github.com/avdgaag/subcheat"
-    gem.authors = ["Arjan van der Gaag"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "cucumber", ">= 0"
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
+desc 'Generate code coverage report'
+task :coverage do
+  ENV['COVERAGE'] = 'true'
+  Rake::Task['test'].invoke
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "subcheat #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rdoc/task'
+RDoc::Task.new :doc do |t|
+  t.title = "subcheat #{Subcheat::VERSION}"
+  t.main = 'README.rdoc'
+  t.rdoc_dir = 'doc'
+  t.rdoc_files.include('README.rdoc', 'lib/**/*.rb')
 end

data/lib/subcheat.rb

@@ -1,12 +1,7 @@
-# Require all subcheat components
-%w{exceptions runner svn command}.each do |filename|
-  require File.join(File.dirname(__FILE__), 'subcheat', filename)
-end
-
+require 'subcheat/exceptions'
 module Subcheat
-  # Report the version number from /VERSION
-  def version
-    File.read(File.join(File.dirname(__FILE__), *%w{.. VERSION}))
-  end
-  extend self
-end
+  autoload :Runner,           'subcheat/runner'
+  autoload :Command,          'subcheat/command'
+  autoload :Svn,              'subcheat/svn'
+  autoload :VERSION,          'subcheat/version'
+end

data/lib/subcheat/commands/shortcuts.rb

@@ -23,6 +23,11 @@ Subcheat::Command.define('cop') do
   "svn checkout #{url} #{arguments[1..-1].join(' ')}"
 end
 
+# Print pretty formatted log output
+Subcheat::Command.define('pretty-log') do
+  %Q{svn log --stop-on-copy -q | grep -E "r[0-9]+" | tail -1 | sed 's/r\([0-9][0-9]*\).*/\1/'}
+end
+
 # Enable exporting of tags
 #
 #   > svn export REL-1.0 ~/Desktop/export
@@ -54,4 +59,4 @@ Subcheat::Command.define('switch') do
       arguments[1..-1].join(' ')
     ]
   end
-end
+end

data/lib/subcheat/commands/undo.rb

@@ -12,11 +12,11 @@
 Subcheat::Command.define('undo') do
   revision, url = arguments[0], arguments[1]
   revision = case revision
-    when /^\d+$/: "#{revision}:#{revision.to_i - 1}"
-    when /^\d+:\d+$/: revision.split(':').reverse.join(':')
+    when /^\d+$/ then "#{revision}:#{revision.to_i - 1}"
+    when /^\d+:\d+$/ then revision.split(':').reverse.join(':')
     else
       raise Subcheat::CommandException, "Bad revision: #{revision}"
   end
   url ||= attr('URL')
   "svn merge -r #{revision} #{url}"
-end
+end

data/lib/subcheat/version.rb

@@ -0,0 +1,4 @@
+module Subcheat
+  VERSION = '0.4.0'
+end
+

data/subcheat.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "subcheat/version"
+
+Gem::Specification.new do |s|
+  s.name        = 'subcheat'
+  s.version     = Subcheat::VERSION
+  s.authors     = ['Arjan van der Gaag']
+  s.email       = ['arjan@arjanvandergaag.nl']
+  s.homepage    = 'http://github.com/avdgaag/subcheat'
+  s.summary     = 'Wrapper for Subversion CLI'
+  s.description = 'Wrap the Subversion CLI to extract some usage patterns into commands'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'mocha', '>= 0.9.8'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rdoc', '~> 3.9'
+end

data/test/command_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+describe Subcheat::Command do
+  it 'should create a command' do
+    old_count = Subcheat::Command.commands.size
+    Subcheat::Command.define('name') { puts 'foo' }
+    Subcheat::Command.commands.size.must_equal old_count + 1
+  end
+
+  it 'should find a command by name' do
+    Subcheat::Command.on('undo').must_be_instance_of Subcheat::Command
+  end
+
+  it 'should raise when loading non-exstant commands' do
+    lambda { Subcheat::Command.on('foo') }.must_raise(Subcheat::NoSuchCommand)
+  end
+end

data/test/runner_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+describe Subcheat::Runner do
+  before do
+    Subcheat::Runner.output = StringIO.new
+    Subcheat::Runner.perform_run = false
+  end
+
+  def subcheat_output
+    Subcheat::Runner.output.string.chomp
+  end
+
+  describe 'No arguments' do
+    it 'should run help by default' do
+      Subcheat::Runner.new
+      subcheat_output.must_equal 'svn help'
+    end
+  end
+
+  describe 'unwrapped commands' do
+    it 'should pass through commands' do
+      Subcheat::Runner.new('status')
+      subcheat_output.must_equal 'svn status'
+    end
+
+    it 'should pass through arguments' do
+      Subcheat::Runner.new('status --ignore-externals')
+      subcheat_output.must_equal 'svn status --ignore-externals'
+    end
+  end
+
+  describe 'wrapped commands' do
+    it 'should find and call associated command' do
+      Subcheat::Command.expects(:on).with('undo').returns(stub(:call => 'foo'))
+      Subcheat::Runner.new('undo', '55')
+      subcheat_output.must_equal 'foo'
+    end
+  end
+end

data/test/subcheat_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+describe Subcheat do
+  it 'should report version number' do
+    Subcheat::VERSION.must_be_instance_of String
+  end
+end

data/test/svn_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+describe Subcheat::Svn do
+  before do
+    @info = <<-EOS
+Path: .
+URL: https://some-kind-of-svn.com/svn/project_name/branches/languages
+Repository Root: https://some-kind-of-svn.com/svn
+Repository UUID: 11af7ba9-5ee7-4c51-9542-47637e3bfceb
+Revision: 8049
+Node Kind: directory
+Schedule: normal
+Last Changed Author: Andy
+Last Changed Rev: 5019
+Last Changed Date: 2009-12-11 15:12:57 +0100 (vr, 11 dec 2009)
+
+    EOS
+    @svn = Subcheat::Svn.new([])
+    @svn.stubs(:info).returns(@info)
+  end
+
+  it 'should read attributes' do
+    @svn.attr('URL').must_equal 'https://some-kind-of-svn.com/svn/project_name/branches/languages'
+    @svn.attr('Revision').must_equal '8049'
+  end
+
+  it 'find project base URL' do
+    @svn.base_url.must_equal 'https://some-kind-of-svn.com/svn/project_name/'
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+require 'minitest/autorun'
+require 'mocha'
+require 'subcheat'

metadata

@@ -1,76 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subcheat
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Arjan van der Gaag
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-10 00:00:00 +01:00
-default_executable: subcheat
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+date: 2011-10-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70188927126540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70188927126540
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70188927117000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70188927117000
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70188927115080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
+  version_requirements: *70188927115080
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70188927113220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70188927113220
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70188927111720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70188927111720
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70188927109880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70188927109880
 description: Wrap the Subversion CLI to extract some usage patterns into commands
-email: arjan@arjanvandergaag.nl
-executables: 
+email:
+- arjan@arjanvandergaag.nl
+executables:
 - subcheat
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/subcheat
 - features/shortcuts.feature
 - features/step_definitions/wrapper_steps.rb
@@ -87,44 +108,51 @@ files:
 - lib/subcheat/exceptions.rb
 - lib/subcheat/runner.rb
 - lib/subcheat/svn.rb
-- test/helper.rb
-- test/test_command.rb
-- test/test_runner.rb
-- test/test_subcheat.rb
-- test/test_svn.rb
-has_rdoc: true
+- lib/subcheat/version.rb
+- subcheat.gemspec
+- test/command_test.rb
+- test/runner_test.rb
+- test/subcheat_test.rb
+- test/svn_test.rb
+- test/test_helper.rb
 homepage: http://github.com/avdgaag/subcheat
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: 4452813104064210158
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4452813104064210158
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Wrapper for Subversion CLI
-test_files: 
-- test/helper.rb
-- test/test_command.rb
-- test/test_runner.rb
-- test/test_subcheat.rb
-- test/test_svn.rb
+test_files:
+- features/shortcuts.feature
+- features/step_definitions/wrapper_steps.rb
+- features/subcommands.feature
+- features/support/env.rb
+- features/wrapper.feature
+- test/command_test.rb
+- test/runner_test.rb
+- test/subcheat_test.rb
+- test/svn_test.rb
+- test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.3.0

data/test/helper.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'subcheat'
-
-class Test::Unit::TestCase
-  def disable_running_of_commands
-    Subcheat::Runner.output = StringIO.new
-    Subcheat::Runner.perform_run = false
-  end
-
-  def subcheat_output
-    Subcheat::Runner.output.string.chomp
-  end
-end

data/test/test_command.rb

@@ -1,21 +0,0 @@
-require 'helper'
-
-class TestRunner < Test::Unit::TestCase
-  context "creating a command" do
-    should "create a command" do
-      old_count = Subcheat::Command.commands.size
-      Subcheat::Command.define('name') { puts 'foo' }
-      assert_equal(old_count + 1, Subcheat::Command.commands.size)
-    end
-  end
-
-  context 'finding commands' do
-    should 'return a command for a name' do
-      assert_instance_of(Subcheat::Command, Subcheat::Command.on('undo'))
-    end
-
-    should 'raise when loading non-exstant commands' do
-      assert_raise(Subcheat::NoSuchCommand) { Subcheat::Command.on('foo') }
-    end
-  end
-end

data/test/test_runner.rb

@@ -1,42 +0,0 @@
-require 'helper'
-
-class TestRunner < Test::Unit::TestCase
-  context 'No arguments' do
-    setup do
-      disable_running_of_commands
-    end
-
-    should 'run help by default' do
-      Subcheat::Runner.new
-      assert_equal('svn help', subcheat_output)
-    end
-  end
-
-  context 'unwrapped commands' do
-    setup do
-      disable_running_of_commands
-    end
-
-    should 'pass through commands' do
-      Subcheat::Runner.new('status')
-      assert_equal('svn status', subcheat_output)
-    end
-
-    should 'pass through arguments' do
-      Subcheat::Runner.new('status --ignore-externals')
-      assert_equal('svn status --ignore-externals', subcheat_output)
-    end
-  end
-
-  context 'wrapped commands' do
-    setup do
-      disable_running_of_commands
-    end
-
-    should 'find and call associated command' do
-      Subcheat::Command.expects(:on).with('undo').returns(stub(:call => 'foo'))
-      Subcheat::Runner.new('undo', '55')
-      assert_equal('foo', subcheat_output)
-    end
-  end
-end

data/test/test_subcheat.rb

@@ -1,8 +0,0 @@
-require 'helper'
-
-class TestSubcheat < Test::Unit::TestCase
-  should 'report version number' do
-    File.expects(:read).returns('foo')
-    assert_equal 'foo', Subcheat.version
-  end
-end

data/test/test_svn.rb

@@ -1,32 +0,0 @@
-require 'helper'
-
-class TestRunner < Test::Unit::TestCase
-  context 'a working copy' do
-    setup do
-      @info = <<-EOS
-Path: .
-URL: https://some-kind-of-svn.com/svn/project_name/branches/languages
-Repository Root: https://some-kind-of-svn.com/svn
-Repository UUID: 11af7ba9-5ee7-4c51-9542-47637e3bfceb
-Revision: 8049
-Node Kind: directory
-Schedule: normal
-Last Changed Author: Andy
-Last Changed Rev: 5019
-Last Changed Date: 2009-12-11 15:12:57 +0100 (vr, 11 dec 2009)
-
-EOS
-      @svn = Subcheat::Svn.new([])
-      @svn.stubs(:info).returns(@info)
-    end
-
-    should "read attributes" do
-      assert_equal('https://some-kind-of-svn.com/svn/project_name/branches/languages', @svn.attr('URL'))
-      assert_equal('8049', @svn.attr('Revision'))
-    end
-
-    should 'find project base URL' do
-      assert_equal('https://some-kind-of-svn.com/svn/project_name/', @svn.base_url)
-    end
-  end
-end