git-up 0.3.2 → 0.4.1

data/README.md

@@ -12,3 +12,11 @@ although
 
 `git-up` might mess up your branches, or set your chest hair on fire, or be racist to your cat, I don't know. It works for me.
 
+configuration
+-------------
+
+`git-up` now has some configuration.  Yay.
+
+As of `v0.4.1`, `git-up` can check your app for any new bundled gems and suggest a `bundle install` if necessary.
+
+It slows the process down slightly, and is therefore enabled by setting `GIT_UP_BUNDLER_CHECK='true'` in your `.bashrc`, `.profile`, or whatever.

data/lib/git-up.rb

@@ -43,6 +43,8 @@ class GitUp
         end
       end
     end
+
+    check_bundler
   rescue GitError => e
     puts e.message
     exit 1
@@ -117,6 +119,18 @@ class GitUp
     end
   end
 
+  def check_bundler
+    return unless use_bundler?
+
+    begin
+      require 'bundler'
+      ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile')
+      Bundler.setup
+    rescue Bundler::GemNotFound
+      puts 'Gems are missing.  You should `bundle install`.'.yellow
+    end
+  end
+
   def is_fast_forward?(a, b)
     merge_base(a.name, b.name) == b.commit.sha
   end
@@ -145,5 +159,11 @@ class GitUp
       @msg
     end
   end
+
+private
+
+  def use_bundler?
+    ENV['GIT_UP_BUNDLER_CHECK'] == 'true' and File.exists? 'Gemfile'
+  end
 end
 

data/lib/git-up/version.rb

@@ -0,0 +1,3 @@
+class GitUp
+  VERSION = "0.4.1"
+end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: git-up
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aanand Prasad
+- Elliot Crosby-McCullough
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -04:00
-default_executable: git-up
+date: 2010-10-21 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -26,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -55,40 +53,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 description: 
-email: aanand.prasad@gmail.com
+email: 
+- aanand.prasad@gmail.com
+- elliot.cm@gmail.com
 executables: 
 - git-up
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
 - bin/git-up
-- git-up.gemspec
+- lib/git-up/version.rb
 - lib/git-up.rb
-- test/helper.rb
-- test/test_git-up.rb
+- LICENSE
+- README.md
 has_rdoc: true
 homepage: http://github.com/aanand/git-up
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -96,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -105,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -116,6 +106,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches
-test_files: 
-- test/helper.rb
-- test/test_git-up.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

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

data/Rakefile

@@ -1,55 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "git-up"
-    gem.summary = %Q{git command to fetch and rebase all branches}
-    gem.email = "aanand.prasad@gmail.com"
-    gem.homepage = "http://github.com/aanand/git-up"
-    gem.authors = ["Aanand Prasad"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-
-    gem.add_dependency "colored", ">= 1.2"
-    gem.add_dependency "grit"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  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
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "git-up #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.3.2

data/git-up.gemspec

@@ -1,62 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{git-up}
-  s.version = "0.3.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aanand Prasad"]
-  s.date = %q{2010-06-16}
-  s.default_executable = %q{git-up}
-  s.email = %q{aanand.prasad@gmail.com}
-  s.executables = ["git-up"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/git-up",
-     "git-up.gemspec",
-     "lib/git-up.rb",
-     "test/helper.rb",
-     "test/test_git-up.rb"
-  ]
-  s.homepage = %q{http://github.com/aanand/git-up}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{git command to fetch and rebase all branches}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_git-up.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<colored>, [">= 1.2"])
-      s.add_runtime_dependency(%q<grit>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<colored>, [">= 1.2"])
-      s.add_dependency(%q<grit>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<colored>, [">= 1.2"])
-    s.add_dependency(%q<grit>, [">= 0"])
-  end
-end
-

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'git-up'
-
-class Test::Unit::TestCase
-end

data/test/test_git-up.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestGitUp < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end