sql_tree 0.1.1 → 0.2.0

data/lib/sql_tree/token.rb

@@ -140,10 +140,12 @@ class SQLTree::Token
   RPAREN = Class.new(SQLTree::Token).new(')')
   DOT    = Class.new(SQLTree::Token).new('.')
   COMMA  = Class.new(SQLTree::Token).new(',')
+  STRING_ESCAPE = Class.new(SQLTree::Token).new('E')
 
   # A list of all the SQL reserverd keywords.
   KEYWORDS = %w{SELECT FROM WHERE GROUP HAVING ORDER DISTINCT LEFT RIGHT INNER FULL OUTER NATURAL JOIN USING
-                AND OR NOT AS ON IS NULL BY LIKE ILIKE BETWEEN IN ASC DESC INSERT INTO VALUES DELETE UPDATE SET}
+                AND OR NOT AS ON IS NULL BY LIKE ILIKE BETWEEN IN ASC DESC INSERT INTO VALUES DELETE UPDATE
+                SET BEGIN COMMIT ROLLBACK TO INTERVAL COUNT}
 
   # Create a token for all the reserved keywords in SQL
   KEYWORDS.each { |kw| const_set(kw, Class.new(SQLTree::Token::Keyword)) }

data/lib/sql_tree/tokenizer.rb

@@ -94,6 +94,7 @@ class SQLTree::Tokenizer
       when ',';            handle_token(SQLTree::Token::COMMA, &block)
       when /\d/;           tokenize_number(&block)
       when "'";            tokenize_quoted_string(&block)
+      when 'E';            tokenize_possible_escaped_string(&block)
       when /\w/;           tokenize_keyword(&block)
       when OPERATOR_CHARS; tokenize_operator(&block)
       when SQLTree.identifier_quote_char; tokenize_quoted_identifier(&block)
@@ -106,6 +107,17 @@ class SQLTree::Tokenizer
 
   alias :each :each_token
 
+  # Tokenizes a something that could be a 'postgresql'-styled string (e.g.
+  # E'foobar'). If the very next char isn't a single quote, then it falls back
+  # to tokenizing a keyword.
+  def tokenize_possible_escaped_string(&block)
+    if peek_char == "'"
+      handle_token(SQLTree::Token::STRING_ESCAPE, &block)
+    else
+      tokenize_keyword(&block)
+    end
+  end
+
   # Tokenizes a eyword in the code. This can either be a reserved SQL keyword
   # or a variable. This method will yield variables directly. Keywords will be
   # yielded with a delay, because they may need to be combined with other

data/spec/{lib → helpers}/matchers.rb

@@ -3,10 +3,10 @@ class TokenizeTo
   def initialize(expected_tokens)
     @expected_tokens = expected_tokens.map do |t|
       case t
-        when SQLTree::Token then t
-        when String         then SQLTree::Token::String.new(t)
-        when Numeric        then SQLTree::Token::Number.new(t)
-        when Symbol         then SQLTree::Token.const_get(t.to_s.upcase)
+        when SQLTree::Token; t
+        when String;         SQLTree::Token::String.new(t)
+        when Numeric;        SQLTree::Token::Number.new(t)
+        when Symbol;         SQLTree::Token.const_get(t.to_s.upcase)
         else "Cannot check for this token: #{t.inspect}!"
       end
     end

data/spec/integration/api_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree, :API do
 

data/spec/integration/parse_and_generate_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree, 'parsing and generating SQL' do
 
@@ -80,4 +80,31 @@ describe SQLTree, 'parsing and generating SQL' do
     SQLTree['UPDATE  table  SET  field1  = 123 WHERE   id  = 17'].to_sql.should ==
             'UPDATE "table" SET "field1" = 123 WHERE ("id" = 17)'
   end
+
+  it "should parse and generate a SET query" do
+    SQLTree["SET client_min_messages TO 'panic'"].to_sql.should ==
+            "SET \"client_min_messages\" TO 'panic'"
+  end
+
+  it "should parse and generate a BEGIN statement" do
+    SQLTree["BEGIN"].to_sql.should == "BEGIN"
+  end
+
+  it "should parse and generate a COMMIT statement" do
+    SQLTree["COMMIT"].to_sql.should == "COMMIT"
+  end
+
+  it "should parse and generate a COMMIT statement" do
+    SQLTree["ROLLBACK"].to_sql.should == "ROLLBACK"
+  end
+
+  it "should parse and generate a SELECT query with a function that takes star as arg" do
+    SQLTree["SELECT count(*) FROM jobs"].to_sql.should ==
+      'SELECT COUNT(*) FROM "jobs"'
+  end
+
+  it "should parse and generate a LEFT OUTER JOIN query" do
+    SQLTree["SELECT * FROM table_a LEFT OUTER JOIN table_b ON foo = bar"].to_sql.should ==
+      "SELECT * FROM \"table_a\" LEFT OUTER JOIN \"table_b\" ON (\"foo\" = \"bar\")"
+  end
 end

data/spec/spec_helper.rb

@@ -1,26 +1,10 @@
-$:.reject! { |e| e.include? 'TextMate' }
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
-require 'spec'
+require 'bundler/setup'
 require 'sql_tree'
 
-module SQLTree::Spec
-  module NodeLoader
-    def self.const_missing(const)
-      SQLTree::Node.const_get(const)
-    end
-  end
+# Load helper files.
+require 'helpers/matchers'
 
-  module TokenLoader
-    def self.const_missing(const)
-      SQLTree::Token.const_get(const)
-    end
-  end
+RSpec.configure do |config|
+  # Nothing special going on
 end
-
-Spec::Runner.configure do |config|
-
-end
-
-require "#{File.dirname(__FILE__)}/lib/matchers"

data/spec/unit/control_statements_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe SQLTree, 'for transaction statements' do
+  
+  it "should parse a BEGIN statement correctly" do
+    SQLTree['BEGIN'].should be_kind_of(SQLTree::Node::BeginStatement)
+  end
+
+  it "should parse a COMMIT statement correctly" do
+    SQLTree['COMMIT'].should be_kind_of(SQLTree::Node::CommitStatement)
+  end
+
+  it "should parse a ROLLBACK statement correctly" do
+    SQLTree['ROLLBACK'].should be_kind_of(SQLTree::Node::RollbackStatement)
+  end
+  
+end

data/spec/unit/delete_query_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::DeleteQuery do
 

data/spec/unit/expression_node_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::Expression do
 
@@ -19,6 +19,16 @@ describe SQLTree::Node::Expression do
       function.arguments.should == [SQLTree::Node::Expression::Value.new('string')]
     end
 
+    it "shoud parse an escaped string correctly" do
+      string = SQLTree::Node::Expression["E'string'"]
+      string.should == SQLTree::Node::Expression::Value.new("string")
+    end
+
+    it "should parse a postgresql interval expression correctly" do
+      interval = SQLTree::Node::Expression["interval '2 hours'"]
+      interval.value.should == "2 hours"
+    end
+
     it "should parse a logical OR expression correctly" do
       logical = SQLTree::Node::Expression["'this' OR 'that"]
       logical.operator.should == 'OR'
@@ -101,3 +111,31 @@ describe SQLTree::Node::Expression do
     end
   end
 end
+
+describe SQLTree::Node::SelectExpression do
+  describe '.parse' do
+    it "should parse a COUNT(*) call correctly" do
+      count = SQLTree::Node::SelectExpression["COUNT(*)"]
+      count.distinct.should be_false
+      count.expression.should == SQLTree::Node::ALL_FIELDS
+    end
+
+    it "should parse a COUNT(DISTINCT *) call correctly" do
+      count = SQLTree::Node::SelectExpression["COUNT(DISTINCT *)"]
+      count.distinct.should be_true
+      count.expression.should == SQLTree::Node::ALL_FIELDS
+    end
+
+    it "should parse a COUNT(DISTINCT(*)) call correctly" do
+      count = SQLTree::Node::SelectExpression["COUNT(DISTINCT(*))"]
+      count.distinct.should be_true
+      count.expression.should == SQLTree::Node::ALL_FIELDS
+    end
+    
+    it "should parse a COUNT(field) call correctly" do
+      count = SQLTree::Node::SelectExpression["COUNT(field)"]
+      count.distinct.should be_false
+      count.expression.should == SQLTree::Node::Expression['field']
+    end
+  end
+end

data/spec/unit/insert_query_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::InsertQuery do
   

data/spec/unit/leaf_node_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::Expression::Value do
 

data/spec/unit/select_query_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::SelectQuery do
   
@@ -73,6 +73,10 @@ describe SQLTree::Node::Join do
   it "should parse a table alias without AS" do
     SQLTree::Node::Join['LEFT JOIN table t ON other.field = table.field'].table_alias.should == 't'
   end
+
+  it "should parse an outer join table" do
+    SQLTree::Node::Join['LEFT OUTER JOIN table ON other.field = table.field'].table.should == 'table'
+  end
 end
 
 describe SQLTree::Node::Ordering do

data/spec/unit/set_query_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe SQLTree::Node::SetQuery do
+
+  it "should parse a set query correctly" do
+    set = SQLTree::Node::SetQuery["SET foo TO 'var'"]
+    set.variable.should == SQLTree::Node::Expression::Field.new("foo")
+    set.value.should == SQLTree::Node::Expression::Value.new("var")
+  end
+
+end

data/spec/unit/tokenizer_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Tokenizer do
 
@@ -11,6 +11,10 @@ describe SQLTree::Tokenizer do
       SQLTree::Tokenizer.tokenize('and').should tokenize_to(:and)
     end
 
+    it "should tokenize a begin SQL keyword" do
+      SQLTree::Tokenizer.tokenize('BEGIN').should tokenize_to(:begin)
+    end
+
     it "should tokenize muliple separate keywords" do
       SQLTree::Tokenizer.tokenize('SELECT DISTINCT').should tokenize_to(:select, :distinct)
     end
@@ -58,6 +62,14 @@ describe SQLTree::Tokenizer do
     it "should tokenize commas" do
       SQLTree::Tokenizer.tokenize('a , "b"').should tokenize_to(sql_var('a'), comma, sql_var('b'))
     end
+
+    it "should tokenize postgresql string escape token" do
+      SQLTree::Tokenizer.tokenize("E'foo'").should tokenize_to(:string_escape, "foo")
+    end
+
+    it "should tokenize postgresql interval statements" do
+      SQLTree::Tokenizer.tokenize("interval '2 days'").should tokenize_to(:interval, "2 days")
+    end
   end
 
   # # Combined tokens are disabled for now;
@@ -77,6 +89,10 @@ describe SQLTree::Tokenizer do
     it "should tokenize a function call" do
       SQLTree::Tokenizer.tokenize("MD5('test')").should tokenize_to(sql_var('MD5'), lparen, 'test', rparen)
     end
+
+    it "should tokenize a posgresql SET call" do
+      SQLTree::Tokenizer.tokenize("SET client_min_messages TO 'panic'").should tokenize_to(:set, sql_var('client_min_messages'), :to, 'panic')
+    end
   end
 
 end

data/spec/unit/update_query_spec.rb

@@ -1,8 +1,8 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require 'spec_helper'
 
 describe SQLTree::Node::UpdateQuery do
 
-  it "should parse a delete query without WHERE clause correctly" do
+  it "should parse an UPDATE query without WHERE clause correctly" do
     update = SQLTree::Node::UpdateQuery["UPDATE table SET field1 = 1, field2 = 5 - 3"]
     update.table.should == SQLTree::Node::TableReference.new("table")
     update.updates.should have(2).items
@@ -13,7 +13,7 @@ describe SQLTree::Node::UpdateQuery do
     update.where.should be_nil
   end
 
-  it "should parse a delete query without WHERE clause correctly" do
+  it "should parse an UPDATE query with WHERE clause correctly" do
     update = SQLTree::Node::UpdateQuery["UPDATE table SET field = 1 WHERE id = 17"]
     update.table.should == SQLTree::Node::TableReference.new("table")
     update.updates.should have(1).item

data/sql_tree.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not modify the version and date values by hand, because this will
   # automatically by them gem release script.
-  s.version = "0.1.1"
-  s.date    = "2009-10-17"
+  s.version = "0.2.0"
+  s.date    = "2011-01-30"
 
   s.summary = "A pure Ruby library to represent SQL queries with a syntax tree for inspection and modification."
   s.description = <<-EOS
@@ -17,11 +17,14 @@ Gem::Specification.new do |s|
   s.email    = 'willem@vanbergen.org'
   s.homepage = 'http://wiki.github.com/wvanbergen/sql_tree'
 
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 2')
+
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
   # Do not modify the files and test_files values by hand, because this will
   # automatically by them gem release script.
-  s.files = %w(spec/unit/select_query_spec.rb spec/unit/insert_query_spec.rb spec/spec_helper.rb lib/sql_tree/tokenizer.rb lib/sql_tree/node/join.rb .gitignore lib/sql_tree/node/ordering.rb LICENSE spec/lib/matchers.rb lib/sql_tree/parser.rb sql_tree.gemspec spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb spec/unit/delete_query_spec.rb spec/unit/leaf_node_spec.rb lib/sql_tree/token.rb lib/sql_tree/node/table_reference.rb lib/sql_tree/node/source.rb lib/sql_tree/node/insert_query.rb Rakefile tasks/github-gem.rake spec/unit/update_query_spec.rb spec/integration/parse_and_generate_spec.rb lib/sql_tree/node/select_query.rb lib/sql_tree/node.rb README.rdoc spec/integration/api_spec.rb lib/sql_tree/node/expression.rb lib/sql_tree/node/delete_query.rb lib/sql_tree/node/select_declaration.rb lib/sql_tree.rb lib/sql_tree/node/update_query.rb)
-  s.test_files = %w(spec/unit/select_query_spec.rb spec/unit/insert_query_spec.rb spec/unit/tokenizer_spec.rb spec/unit/expression_node_spec.rb spec/unit/delete_query_spec.rb spec/unit/leaf_node_spec.rb spec/unit/update_query_spec.rb spec/integration/parse_and_generate_spec.rb spec/integration/api_spec.rb)
+  s.files = %w(.gitignore .infinity_test Gemfile LICENSE README.rdoc Rakefile lib/sql_tree.rb lib/sql_tree/node.rb lib/sql_tree/node/begin_statement.rb lib/sql_tree/node/commit_statement.rb lib/sql_tree/node/delete_query.rb lib/sql_tree/node/expression.rb lib/sql_tree/node/insert_query.rb lib/sql_tree/node/join.rb lib/sql_tree/node/ordering.rb lib/sql_tree/node/rollback_statement.rb lib/sql_tree/node/select_declaration.rb lib/sql_tree/node/select_query.rb lib/sql_tree/node/set_query.rb lib/sql_tree/node/source.rb lib/sql_tree/node/table_reference.rb lib/sql_tree/node/update_query.rb lib/sql_tree/parser.rb lib/sql_tree/token.rb lib/sql_tree/tokenizer.rb spec/helpers/matchers.rb spec/integration/api_spec.rb spec/integration/parse_and_generate_spec.rb spec/spec_helper.rb spec/unit/control_statements_spec.rb spec/unit/delete_query_spec.rb spec/unit/expression_node_spec.rb spec/unit/insert_query_spec.rb spec/unit/leaf_node_spec.rb spec/unit/select_query_spec.rb spec/unit/set_query_spec.rb spec/unit/tokenizer_spec.rb spec/unit/update_query_spec.rb sql_tree.gemspec tasks/github-gem.rb)
+  s.test_files = %w(spec/integration/api_spec.rb spec/integration/parse_and_generate_spec.rb spec/unit/control_statements_spec.rb spec/unit/delete_query_spec.rb spec/unit/expression_node_spec.rb spec/unit/insert_query_spec.rb spec/unit/leaf_node_spec.rb spec/unit/select_query_spec.rb spec/unit/set_query_spec.rb spec/unit/tokenizer_spec.rb spec/unit/update_query_spec.rb)
 end

data/tasks/{github-gem.rake → github-gem.rb}

@@ -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 }
+
+          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(: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'] || gemspec.version).dup)
+      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)
+      sh git, 'push', '--tags', remote, remote_branch
     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 }
-    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,30 +331,35 @@ 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
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
-
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
-
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      require 'net/https'
+      require 'uri'
+      
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
+
+      if Net::HTTPSuccess === response
         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
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
-
   end
 end