hub 1.10.0 → 1.10.1

data/lib/hub/context.rb

@@ -98,7 +98,7 @@ module Hub
     end
 
     repo_methods = [
-      :current_branch, :master_branch,
+      :current_branch,
       :current_project, :upstream_project,
       :repo_owner, :repo_host,
       :remotes, :remotes_group, :origin_remote
@@ -107,6 +107,15 @@ module Hub
     def_delegators :local_repo, *repo_methods
     private :repo_name, *repo_methods
 
+    def master_branch
+      if local_repo(false)
+        local_repo.master_branch
+      else
+        # FIXME: duplicates functionality of LocalRepo#master_branch
+        Branch.new nil, 'refs/heads/master'
+      end
+    end
+
     class LocalRepo < Struct.new(:git_reader, :dir)
       include GitReaderMethods
 

data/lib/hub/github_api.rb

@@ -285,7 +285,8 @@ module Hub
       end
 
       def load
-        @data.update YAML.load(File.read(@filename))
+        existing_data = File.read(@filename)
+        @data.update YAML.load existing_data unless existing_data.strip.empty?
       end
 
       def save

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.0'
+  Version = VERSION = '1.10.1'
 end

data/test/hub_test.rb

@@ -572,112 +572,6 @@ class HubTest < Test::Unit::TestCase
       "echo https://github.com/defunkt/hub/compare/1.0...1.1"
   end
 
-  def test_hub_browse
-    assert_command "browse mojombo/bert", "open https://github.com/mojombo/bert"
-  end
-
-  def test_hub_browse_commit
-    assert_command "browse mojombo/bert commit/5d5582", "open https://github.com/mojombo/bert/commit/5d5582"
-  end
-
-  def test_hub_browse_tracking_nothing
-    stub_tracking_nothing
-    assert_command "browse mojombo/bert", "open https://github.com/mojombo/bert"
-  end
-
-  def test_hub_browse_url
-    assert_command "browse -u mojombo/bert", "echo https://github.com/mojombo/bert"
-  end
-
-  def test_hub_browse_self
-    assert_command "browse resque", "open https://github.com/tpw/resque"
-  end
-
-  def test_hub_browse_subpage
-    assert_command "browse resque commits",
-      "open https://github.com/tpw/resque/commits/master"
-    assert_command "browse resque issues",
-      "open https://github.com/tpw/resque/issues"
-    assert_command "browse resque wiki",
-      "open https://github.com/tpw/resque/wiki"
-  end
-
-  def test_hub_browse_on_branch
-    stub_branch('refs/heads/feature')
-    stub_tracking('feature', 'mislav', 'experimental')
-
-    assert_command "browse resque", "open https://github.com/tpw/resque"
-    assert_command "browse resque commits",
-      "open https://github.com/tpw/resque/commits/master"
-
-    assert_command "browse",
-      "open https://github.com/mislav/hub/tree/experimental"
-    assert_command "browse -- tree",
-      "open https://github.com/mislav/hub/tree/experimental"
-    assert_command "browse -- commits",
-      "open https://github.com/mislav/hub/commits/experimental"
-  end
-
-  def test_hub_browse_on_complex_branch
-    stub_branch('refs/heads/feature/foo')
-    stub_tracking('feature/foo', 'mislav', 'feature/bar')
-
-    assert_command 'browse',
-      'open https://github.com/mislav/hub/tree/feature/bar'
-  end
-
-  def test_hub_browse_no_branch
-    stub_branch(nil)
-    assert_command 'browse', 'open https://github.com/defunkt/hub'
-  end
-
-  def test_hub_browse_current
-    assert_command "browse", "open https://github.com/defunkt/hub"
-    assert_command "browse --", "open https://github.com/defunkt/hub"
-  end
-
-  def test_hub_browse_current_https_uri
-    stub_repo_url "https://github.com/defunkt/hub"
-    assert_command "browse", "open https://github.com/defunkt/hub"
-  end
-
-  def test_hub_browse_commit_from_current
-    assert_command "browse -- commit/6616e4", "open https://github.com/defunkt/hub/commit/6616e4"
-  end
-
-  def test_hub_browse_no_tracking
-    stub_tracking_nothing
-    assert_command "browse", "open https://github.com/defunkt/hub"
-  end
-
-  def test_hub_browse_no_tracking_on_branch
-    stub_branch('refs/heads/feature')
-    stub_tracking_nothing('feature')
-    assert_command "browse", "open https://github.com/defunkt/hub"
-  end
-
-  def test_hub_browse_current_wiki
-    stub_repo_url 'git://github.com/defunkt/hub.wiki.git'
-
-    assert_command "browse", "open https://github.com/defunkt/hub/wiki"
-    assert_command "browse -- wiki", "open https://github.com/defunkt/hub/wiki"
-    assert_command "browse -- commits", "open https://github.com/defunkt/hub/wiki/_history"
-    assert_command "browse -- pages", "open https://github.com/defunkt/hub/wiki/_pages"
-  end
-
-  def test_hub_browse_current_subpage
-    assert_command "browse -- network",
-      "open https://github.com/defunkt/hub/network"
-    assert_command "browse -- anything/everything",
-      "open https://github.com/defunkt/hub/anything/everything"
-  end
-
-  def test_hub_browse_deprecated_private
-    with_browser_env('echo') do
-      assert_includes "Warning: the `-p` flag has no effect anymore\n", hub("browse -p defunkt/hub")
-    end
-  end
-
   def test_hub_browse_no_repo
     stub_repo_url(nil)
     assert_equal "Usage: hub browse [<USER>/]<REPOSITORY>\n", hub("browse")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70214831337220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214831337220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70214831336720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214831336720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "  `hub` is a command line utility which adds GitHub knowledge to `git`.\n\n
   \ It can used on its own or as a `git` wrapper.\n\n  Normal:\n\n      $ hub clone
   rtomayko/tilt\n\n      Expands to:\n      $ git clone git://github.com/rtomayko/tilt.git\n\n
@@ -95,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command-line wrapper for git and GitHub