clieop 0.1.4 → 0.2.0

data/.gitignore

@@ -1,3 +1,4 @@
 clieop-*.gem
 .svn/
-.DS_Store
+.DS_Store
+/.bundle/

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    clieop (0.1.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.4.1)
+    diff-lcs (1.1.2)
+    rake (0.8.7)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ZenTest (~> 4.4)
+  clieop!
+  rake
+  rspec (~> 2.2)

data/README.rdoc

@@ -20,7 +20,14 @@ http://www.ingbank.nl/ing/downloadables/eclieop1.pdf
 
 == Usage
 
-Run <tt>gem install clieop</tt> to install the gem.
+Run <tt>gem install clieop</tt> to install the gem or add <tt>gem 'clieop'</tt> to 
+your project's Gemfile.
 
 See the project's wiki at http://wiki.github.com/wvanbergen/clieop for an example
 creating and writing a direct debt batch file.
+
+== About
+
+This library is released under the MIT license (see <tt>MIT-LICENSE</tt>) and was
+originally written by Willem van Bergen. It is currently being maintained by
+Leon Berenschot.

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/clieop.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not set version and date yourself, this will be done automatically
   # by the gem release script.
-  s.version = "0.1.4"
-  s.date    = "2010-06-02"
+  s.version = "0.2.0"
+  s.date    = "2010-12-09"
 
   s.summary     = "A pure Ruby implementation to write CLIEOP files"
   s.description = "This library is a pure Ruby, MIT licensed implementation of the CLIEOP03 transaction format. CLIEOP03 can be used to communicate direct debt transactions with your (Dutch) bank."
@@ -13,8 +13,12 @@ Gem::Specification.new do |s|
   s.email    = ['willem@vanbergen.org', 'LeipeLeon@gmail.com']
   s.homepage = 'http://github.com/wvanbergen/clieop/wikis'
 
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 2.2')
+  s.add_development_dependency('ZenTest', '~> 4.4')
+  
   # Do not set files and test_files yourself, this will be done automatically
   # by the gem release script.
-  s.files      = %w(spec/spec_helper.rb spec/clieop/batch_spec.rb .gitignore lib/clieop/record.rb MIT-LICENSE doc/clieop03.pdf lib/clieop/file.rb lib/clieop/batch.rb lib/clieop.rb init.rb Rakefile clieop.gemspec README.rdoc tasks/github-gem.rake spec/clieop_spec.rb spec/clieop/record_spec.rb spec/clieop/file_spec.rb)
-  s.test_files = %w(spec/clieop/batch_spec.rb spec/clieop_spec.rb spec/clieop/record_spec.rb spec/clieop/file_spec.rb)
+  s.files      = %w(.gitignore .rspec Gemfile Gemfile.lock MIT-LICENSE README.rdoc Rakefile autotest/discover.rb clieop.gemspec doc/clieop03.pdf init.rb lib/clieop.rb lib/clieop/batch.rb lib/clieop/file.rb lib/clieop/record.rb spec/clieop/batch_spec.rb spec/clieop/file_spec.rb spec/clieop/record_spec.rb spec/clieop_spec.rb spec/spec_helper.rb tasks/github-gem.rake)
+  s.test_files = %w(spec/clieop/batch_spec.rb spec/clieop/file_spec.rb spec/clieop/record_spec.rb spec/clieop_spec.rb)
 end

data/lib/clieop.rb

@@ -1,7 +1,7 @@
 require 'date'
 
 module Clieop
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end
 
 require 'clieop/record.rb'

data/lib/clieop/batch.rb

@@ -49,11 +49,10 @@ module Clieop
       @transactions.each do |tr|
 
         # prepare data for this transaction's records
-        transaction_type = tr[:transaction_type] || (@batch_info[:transaction_group] == 10 ? 1002 : 0)
-        to_account       = @batch_info[:transaction_group] == 10 ? @batch_info[:account_nr] : tr[:account_nr]
-        from_account     = @batch_info[:transaction_group] == 10 ? tr[:account_nr] : @batch_info[:account_nr]
+        transaction_type = tr[:transaction_type] || (transaction_is_payment? ? 1002 : 0)
+        to_account       = transaction_is_payment? ? @batch_info[:account_nr] : tr[:account_nr]
+        from_account     = transaction_is_payment? ? tr[:account_nr] : @batch_info[:account_nr]
         amount_in_cents  = (tr[:amount] * 100).round.to_i
-        name_record      = @batch_info[:transaction_group] == 10 ? :invoice_name : :payment_name
 
         # update checksums
         total_account += tr[:account_nr].to_i
@@ -65,7 +64,7 @@ module Clieop
                           :to_account       => to_account,       :from_account => from_account).to_clieop
 
         # generate record with transaction information
-        batch_data << Clieop::Record.new(name_record, :name => tr[:account_owner]).to_clieop
+        batch_data << Clieop::Record.new(:invoice_name, :name => tr[:account_owner]).to_clieop if transaction_is_payment?
         batch_data << Clieop::Record.new(:transaction_reference, :reference_number => tr[:reference_number]).to_clieop unless tr[:reference_number].nil?
 
         # split discription into lines and make a record for the first 4 lines
@@ -74,6 +73,8 @@ module Clieop
             batch_data << Clieop::Record.new(:transaction_description, :description => line.strip).to_s unless line == ''
           end
         end
+        batch_data << Clieop::Record.new(:payment_name, :name => tr[:account_owner]).to_clieop unless transaction_is_payment?
+
       end
 
       # generate batch footer record including some checks
@@ -104,5 +105,11 @@ module Clieop
       # total.to_s.chars.last(10).join('')     # ruby 1.8.7
     end
 
+  private
+
+    def transaction_is_payment?
+      @batch_info[:transaction_group] == 10
+    end
+
   end
 end

data/lib/clieop/file.rb

@@ -35,9 +35,9 @@ module Clieop
     end
 
     def save(filename)
-      File.open(filename, 'w') do |f|
+      ::File.open(filename, 'w') do |f|
         f.write(self.to_clieop)
       end
     end
   end
-end
+end

data/lib/clieop/record.rb

@@ -57,11 +57,6 @@ module Clieop
             [:record_variant, :alpha, 1, 'B'],
             [:name, :alpha, 35],
           ],
-        :payment_name =>[
-            [:record_code, :numeric, 4, 170],
-            [:record_variant, :alpha, 1, 'B'],
-            [:name, :alpha, 35],
-          ],
         :transaction_reference => [
             [:record_code, :numeric, 4, 150],
             [:record_variant, :alpha, 1, 'A'],
@@ -72,6 +67,11 @@ module Clieop
             [:record_variant, :alpha, 1, 'A'],
             [:description, :alpha, 32],
           ],
+        :payment_name =>[
+            [:record_code, :numeric, 4, 170],
+            [:record_variant, :alpha, 1, 'B'],
+            [:name, :alpha, 35],
+          ],
     }
 
     attr_accessor :definition, :data
@@ -83,8 +83,7 @@ module Clieop
       @definition = Clieop::Record::TYPE_DEFINITIONS[record_type.to_sym]
 
       # set default values according to definition
-      @data = {}
-      @definition.each { |field| @data[field[0]] = field[3] if field[3] }
+      @data = @definition.inject({}) { |memo, field| memo[field[0]] = field[3] if field[3] ; memo }
 
       # set values for all the provided data
       record_data.each { |field, value| @data[field] = value }
@@ -92,15 +91,15 @@ module Clieop
 
     def to_clieop
       line = ""
-      #format each field
-      @definition.each do |field|
+      # format each field
+      @definition.each do |field, type, length, content|
         fmt = '%'
-        fmt << (field[1] == :numeric ? '0' : '-')
-        fmt << (field[2].to_s)
-        fmt << (field[1] == :numeric ? 'd' : 's')
-        raw_data = (field[1] == :numeric) ? @data[field[0]].to_i : @data[field[0]]
+        fmt << (type == :numeric ? '0' : '-')
+        fmt << (length.to_s)
+        fmt << (type == :numeric ? 'd' : 's')
+        raw_data = (type == :numeric) ? @data[field].to_i : @data[field]
         value = sprintf(fmt, raw_data)
-        line << (field[1] == :numeric ? value[0 - field[2], field[2]] : value[0, field[2]])
+        line << (type == :numeric ? value[0 - length, length] : value[0, length])
       end
       # fill each line with spaces up to 50 characters and close with a CR/LF
       line.ljust(50) + "\r\n"

data/spec/clieop/batch_spec.rb

@@ -4,8 +4,8 @@ describe Clieop::Batch do
 
   before(:all) do
     @batch_info = {
-      :description => "Batch" , 
-      :account_nr  => 123456789, 
+      :description   => "Batch",
+      :account_nr    => 123456789,
       :account_owner => "Reciever"
     }
   end
@@ -26,26 +26,84 @@ describe Clieop::Batch do
     batch.batch_info[:transaction_group].should eql(0)
   end
 
-  it "should add transactions to batch" do
-    batch = Clieop::Batch.invoice_batch(@batch_info.dup)
-    batch << {
-      :reference_number => "Factnr 100101",
-      :account_nr       => 123456789,
-      :account_owner    => 'Payee',
-      :amount           => 30102,
-      :description      => "Testing a CLIEOP direct debt transaction\nCharging your bank account",
-      :transaction_type => 1001
-    }
-    batch.batch_info[:transaction_group].should eql(10)
-    batch.to_clieop.should  match(/0010B1001234567890001EUR                          /)
-    batch.to_clieop.should  match(/0020ABatch                                        /)
-    batch.to_clieop.should  match(/0030B1000000Reciever                           P  /)
-    batch.to_clieop.should  match(/0100A100100000301020001234567890123456789         /)
-    batch.to_clieop.should  match(/0110BPayee                                        /)
-    batch.to_clieop.should  match(/0150AFactnr 100101                                /)
-    batch.to_clieop.should  match(/0160ATesting a CLIEOP direct debt tra             /)
-    batch.to_clieop.should  match(/0160ACharging your bank account                   /)
-    batch.to_clieop.should  match(/9990A00000000000301020002469135780000001          /)
+  describe "transactions" do
+
+    describe "Invoice" do
+
+      before do
+        @batch = Clieop::Batch.invoice_batch(@batch_info.dup)
+        @batch << {
+          :reference_number => "Factnr 100101",
+          :account_nr       => 123456789,
+          :account_owner    => 'Payee',
+          :amount           => 30102,
+          :description      => "Testing a CLIEOP direct debt transaction\nCharging your bank account",
+          :transaction_type => 1001
+        }
+      end
+
+      it "should add transactions to batch" do
+        @batch.batch_info[:transaction_group].should eql(10)
+        @batch.to_clieop.should  match(/0010B1001234567890001EUR                          /)
+        @batch.to_clieop.should  match(/0020ABatch                                        /)
+        @batch.to_clieop.should  match(/0030B1000000Reciever                           P  /)
+        @batch.to_clieop.should  match(/0100A100100000301020001234567890123456789         /)
+        @batch.to_clieop.should  match(/0110BPayee                                        /)
+        @batch.to_clieop.should  match(/0150AFactnr 100101                                /)
+        @batch.to_clieop.should  match(/0160ATesting a CLIEOP direct debt tra             /)
+        @batch.to_clieop.should  match(/0160ACharging your bank account                   /)
+        @batch.to_clieop.should  match(/9990A00000000000301020002469135780000001          /)
+      end
+
+      it "should appear in proper order" do
+        last_record_code = 0
+        @batch.to_clieop.split("\n").each do |line|
+          line =~ /^(\d{4})[AB]/
+          $1.to_i.should >= last_record_code
+          last_record_code = $1.to_i
+        end
+      end
+
+    end
+
+    describe "Payment" do
+
+      before do
+        @batch = Clieop::Batch.payment_batch(@batch_info.dup)
+        @batch << {
+          :reference_number => "Factnr 100101",
+          :account_nr       => 123456789,
+          :account_owner    => 'Payee',
+          :amount           => 30102,
+          :description      => "Testing a CLIEOP direct credit transaction\nPaying your bank account",
+          :transaction_type => 1001
+        }
+      end
+
+      it "should add transactions to batch" do
+        @batch.batch_info[:transaction_group].should eql(0)
+        @batch.to_clieop.should  match(/0010B0001234567890001EUR                          /)
+        @batch.to_clieop.should  match(/0020ABatch                                        /)
+        @batch.to_clieop.should  match(/0030B1000000Reciever                           P  /)
+        @batch.to_clieop.should  match(/0100A100100000301020001234567890123456789         /)
+        @batch.to_clieop.should  match(/0150AFactnr 100101                                /)
+        @batch.to_clieop.should  match(/0160ATesting a CLIEOP direct credit t             /)
+        @batch.to_clieop.should  match(/0160APaying your bank account                     /)
+        @batch.to_clieop.should  match(/0170BPayee                                        /)
+        @batch.to_clieop.should  match(/9990A00000000000301020002469135780000001          /)
+      end
+
+      it "should appear in proper order" do
+        last_record_code = 0
+        @batch.to_clieop.split("\n").each do |line|
+          line =~ /^(\d{4})[AB]/
+          $1.to_i.should >= last_record_code
+          last_record_code = $1.to_i
+        end
+      end
+
+    end
+
   end
 
 end

data/spec/clieop/file_spec.rb

@@ -1,5 +1,16 @@
 require 'spec_helper'
 
 describe Clieop::File do
-  
+
+  context "#save" do
+
+    it "should create 'filename' and put the CLIEOP data in it" do
+      file = mock('file')
+      File.should_receive(:open).with("filename", "w").and_yield(file)
+      file.should_receive(:write).with("0001A091210CLIEOP03         1                     \r\n9999A                                             \r\n")
+      subject.save('filename')
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,10 +1,7 @@
 require 'rubygems'
-require 'spec/autorun'
-require 'clieop'
+require 'bundler'
+Bundler.require(:default, :development)
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f }
-
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end
-

data/tasks/github-gem.rake

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
-require 'git'
+require 'set'
 
 module GithubGem
 
@@ -24,7 +24,7 @@ module GithubGem
 
   class RakeTasks
 
-    attr_reader   :gemspec, :modified_files, :git
+    attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
     # Initializes the settings, yields itself for configuration
@@ -33,7 +33,7 @@ module GithubGem
       @gemspec_file   = GithubGem.detect_gemspec_file
       @task_namespace = task_namespace
       @main_include   = GithubGem.detect_main_include
-      @modified_files = []
+      @modified_files = Set.new
       @root_dir       = Dir.pwd
       @test_pattern   = 'test/**/*_test.rb'
       @spec_pattern   = 'spec/**/*_spec.rb'
@@ -43,13 +43,16 @@ module GithubGem
 
       yield(self) if block_given?
 
-      @git = Git.open(@root_dir)
       load_gemspec!
       define_tasks!
     end
 
     protected
 
+    def git
+      @git ||= ENV['GIT'] || 'git'
+    end
+
     # Define Unit test tasks
     def define_test_tasks!
       require 'rake/testtask'
@@ -68,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -119,23 +122,43 @@ module GithubGem
         checks = [:check_current_branch, :check_clean_status, :check_not_diverged, :check_version]
         checks.unshift('spec:basic') if has_specs?
         checks.unshift('test:basic') if has_tests?
-        checks.push << [:check_rubyforge] if gemspec.rubyforge_project
+        # checks.push << [:check_rubyforge] if gemspec.rubyforge_project
 
         desc "Perform all checks that would occur before a release"
         task(:release_checks => checks)
 
-        release_tasks = [:release_checks, :set_version, :build, :github_release]
-        release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
+        release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
+        # release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
 
-        desc "Release a new verison of the gem"
+        desc "Release a new version of the gem using the VERSION environment variable"
         task(:release => release_tasks) { release_task }
+        
+        namespace(:release) do
+          desc "Release the next version of the gem, by incrementing the last version segment by 1"
+          task(:next => [:next_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a patch increment (0.0.1)"
+          task(:patch => [:next_patch_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a minor increment (0.1.0)"
+          task(:minor => [:next_minor_version] + release_tasks) { release_task }
 
-        task(:check_rubyforge)   { check_rubyforge_task }
-        task(:rubyforge_release) { rubyforge_release_task }
+          desc "Release the next version of the gem, using a major increment (1.0.0)"
+          task(:major => [:next_major_version] + release_tasks) { release_task }
+        end
+
+        # task(:check_rubyforge)   { check_rubyforge_task }
+        # task(:rubyforge_release) { rubyforge_release_task }
+        task(:gemcutter_release) { gemcutter_release_task }
         task(:github_release => [:commit_modified_files, :tag_version]) { github_release_task }
         task(:tag_version) { tag_version_task }
         task(:commit_modified_files) { commit_modified_files_task }
 
+        task(:next_version)       { next_version_task }
+        task(:next_patch_version)  { next_version_task(:patch) }
+        task(:next_minor_version) { next_version_task(:minor) }
+        task(:next_major_version) { next_version_task(:major) }
+        
         desc "Updates the gem release tasks with the latest version on Github"
         task(:update_tasks) { update_tasks_task }
       end
@@ -145,7 +168,7 @@ module GithubGem
     # in the repository and the spec/test file pattern.
     def manifest_task
       # Load all the gem's files using "git ls-files"
-      repository_files = git.ls_files.keys
+      repository_files = `#{git} ls-files`.split("\n")
       test_files       = Dir[test_pattern] + Dir[spec_pattern]
 
       update_gemspec(:files, repository_files)
@@ -159,6 +182,32 @@ module GithubGem
       sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
+    def newest_version
+      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+    end
+
+    def next_version(increment = nil)
+      next_version = newest_version.segments
+      increment_index = case increment
+        when :micro then 3
+        when :patch then 2
+        when :minor then 1
+        when :major then 0
+        else next_version.length - 1
+      end
+      
+      next_version[increment_index] ||= 0
+      next_version[increment_index] = next_version[increment_index].succ
+      ((increment_index + 1)...next_version.length).each { |i| next_version[i] = 0 }
+      
+      Gem::Version.new(next_version.join('.'))
+    end
+
+    def next_version_task(increment = nil)
+      ENV['VERSION'] = next_version(increment).version
+      puts "Releasing version #{ENV['VERSION']}..."
+    end
+
     # Updates the version number in the gemspec file, the VERSION constant in the main
     # include file and the contents of the VERSION file.
     def version_task
@@ -171,70 +220,58 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'] || gemspec.version)
-      # Loads the latest version number using the created tags
-      newest_version   = git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max
-      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version && newest_version >= proposed_version
+      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
     # Checks whether the current branch is not diverged from the remote branch
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
     end
 
     # Checks whether the repository status ic clean
     def check_clean_status_task
-      raise "The current working copy contains modifications" if git.status.changed.any?
+      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
     end
 
     # Checks whether the current branch is correct
     def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
+      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
     end
 
     # Fetches the latest updates from Github
     def fetch_origin_task
-      git.fetch('origin')
+      sh git, 'fetch', remote
     end
 
     # Commits every file that has been changed by the release task.
     def commit_modified_files_task
-      if modified_files.any?
-        modified_files.each { |file| git.add(file) }
-        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
+      if really_modified.any?
+        really_modified.each { |file| sh git, 'add', file }
+        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
       end
     end
 
     # Adds a tag for the released version
     def tag_version_task
-      git.add_tag("#{gemspec.name}-#{gemspec.version}")
+      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
     def github_release_task
-      git.push(remote, remote_branch, true)
-    end
-
-    # Checks whether Rubyforge is configured properly
-    def check_rubyforge_task
-      # Login no longer necessary when using rubyforge 2.0.0 gem
-      # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-      output = `rubyforge names`.split("\n")
-      raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-      raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
+      sh git, 'push', '--tags', remote, remote_branch
     end
 
-    # Task to release the .gem file toRubyforge.
-    def rubyforge_release_task
-      sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+    def gemcutter_release_task
+      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -294,6 +331,9 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
+        
+        # Also mark the Gemfile.lock file as changed because of the new version.
+        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end
 
@@ -309,15 +349,13 @@ module GithubGem
         open(__FILE__, "w") { |file| file.write(response.body) }
       end
 
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
-      if git.status[relative_file] && git.status[relative_file].type == 'M'
-        git.add(relative_file)
-        git.commit("Updated to latest gem release management tasks.")
-        puts "Updated to latest version of gem release management tasks."
+      relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+      if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+        sh git, 'add', relative_file
+        sh git, 'commit', '-m', "Updated to latest gem release management tasks."
       else
         puts "Release managament tasks already are at the latest version."
       end
     end
-
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clieop
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,10 +16,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +02:00
+date: 2010-12-09 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 4
+        - 4
+        version: "4.4"
+  type: :development
+  version_requirements: *id003
 description: This library is a pure Ruby, MIT licensed implementation of the CLIEOP03 transaction format. CLIEOP03 can be used to communicate direct debt transactions with your (Dutch) bank.
 email: 
 - willem@vanbergen.org
@@ -31,23 +74,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- spec/spec_helper.rb
-- spec/clieop/batch_spec.rb
 - .gitignore
-- lib/clieop/record.rb
+- .rspec
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
-- doc/clieop03.pdf
-- lib/clieop/file.rb
-- lib/clieop/batch.rb
-- lib/clieop.rb
-- init.rb
+- README.rdoc
 - Rakefile
+- autotest/discover.rb
 - clieop.gemspec
-- README.rdoc
-- tasks/github-gem.rake
-- spec/clieop_spec.rb
-- spec/clieop/record_spec.rb
+- doc/clieop03.pdf
+- init.rb
+- lib/clieop.rb
+- lib/clieop/batch.rb
+- lib/clieop/file.rb
+- lib/clieop/record.rb
+- spec/clieop/batch_spec.rb
 - spec/clieop/file_spec.rb
+- spec/clieop/record_spec.rb
+- spec/clieop_spec.rb
+- spec/spec_helper.rb
+- tasks/github-gem.rake
 has_rdoc: true
 homepage: http://github.com/wvanbergen/clieop/wikis
 licenses: []
@@ -84,6 +131,6 @@ specification_version: 3
 summary: A pure Ruby implementation to write CLIEOP files
 test_files: 
 - spec/clieop/batch_spec.rb
-- spec/clieop_spec.rb
-- spec/clieop/record_spec.rb
 - spec/clieop/file_spec.rb
+- spec/clieop/record_spec.rb
+- spec/clieop_spec.rb