Hello community, here is the log from the commit of package rubygem-hub for openSUSE:Factory checked in at 2014-12-01 14:01:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-hub (Old) and /work/SRC/openSUSE:Factory/.rubygem-hub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-hub" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-hub/rubygem-hub.changes 2014-11-24 11:08:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-hub.new/rubygem-hub.changes 2014-12-01 14:01:16.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Nov 29 12:39:56 UTC 2014 - [email protected] + +- Install the manpage under %{_mandir} +- Version bump 1.12.3: + * Fix hub --noop clone output for repos user has push access to + * Fix hub browse help output when not in any repo + * Tweak URI implementation for compatibility with stdlib + * Ensure branch names with funky characters are shell-escaped + +------------------------------------------------------------------- +Fri Nov 28 16:31:51 UTC 2014 - [email protected] + +- Fix the requires between the versioned and unversion packages +- Move the Provides to the versioned pkg + +------------------------------------------------------------------- Old: ---- hub-1.12.2.gem New: ---- hub-1.12.3.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-hub.spec ++++++ --- /var/tmp/diff_new_pack.NKJfBT/_old 2014-12-01 14:01:17.000000000 +0100 +++ /var/tmp/diff_new_pack.NKJfBT/_new 2014-12-01 14:01:17.000000000 +0100 @@ -24,13 +24,12 @@ # Name: rubygem-hub -Version: 1.12.2 +Version: 1.12.3 Release: 0 %define mod_name hub %define mod_full_name %{mod_name}-%{version} # MANUAL -Requires: rubygem(hub) -Provides: hub = %{version}-%{release} +PreReq: rubygem(%{mod_name}) # /MANUAL BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 5 @@ -71,6 +70,8 @@ # MANUAL install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/%{mod_name} install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/zsh/site-functions/_%{mod_name} +gemdir="$(gem env gemdir)" +install -Dm444 $gemdir/gems/%{mod_full_name}/man/%{mod_name}.1 %{buildroot}%{_mandir}/man1/%{mod_name}.1 # /MANUAL @@ -81,6 +82,7 @@ %dir %{_datadir}/zsh/site-functions %{_datadir}/bash-completion/completions/%{mod_name} %{_datadir}/zsh/site-functions/_%{mod_name} +%{_mandir}/man1/%{mod_name}.1.gz %gem_packages ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.NKJfBT/_old 2014-12-01 14:01:17.000000000 +0100 +++ /var/tmp/diff_new_pack.NKJfBT/_new 2014-12-01 14:01:17.000000000 +0100 @@ -1,15 +1,22 @@ +:main: + :preamble: |- + Provides: %{mod_name} = %{version}-%{release} + Requires: rubygem-%{mod_name} + Recommends: rubygem(%{rb_default_ruby_abi}:%{mod_name}) +:preamble: |- + PreReq: rubygem(%{mod_name}) :sources: - '%{mod_name}.bash_completion.sh' - '%{mod_name}.zsh_completion' :post_install: |- install -Dm0644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/%{mod_name} install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/zsh/site-functions/_%{mod_name} -:preamble: |- - Requires: rubygem(hub) - Provides: hub = %{version}-%{release} + gemdir="$(gem env gemdir)" + install -Dm444 $gemdir/gems/%{mod_full_name}/man/%{mod_name}.1 %{buildroot}%{_mandir}/man1/%{mod_name}.1 :filelist: |- %dir %{_datadir}/bash-completion/completions %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/bash-completion/completions/%{mod_name} %{_datadir}/zsh/site-functions/_%{mod_name} + %{_mandir}/man1/%{mod_name}.1.gz ++++++ hub-1.12.2.gem -> hub-1.12.3.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hub/commands.rb new/lib/hub/commands.rb --- old/lib/hub/commands.rb 2014-07-11 21:05:58.000000000 +0200 +++ new/lib/hub/commands.rb 2014-11-28 01:34:21.000000000 +0100 @@ -86,7 +86,7 @@ abort "Aborted: the origin remote doesn't point to a GitHub repository." end - unless sha = local_repo.git_command("rev-parse -q #{ref}") + unless sha = local_repo.git_command("rev-parse -q '%s'" % ref.gsub("'", "\\'")) abort "Aborted: no revision could be determined from '#{ref}'" end @@ -228,8 +228,11 @@ else format = '%h (%aN, %ar)%n%w(78,3,3)%s%n%+b' default_message = nil - commit_summary = git_command "log --no-color --format='%s' --cherry %s...%s" % - [format, base_branch, remote_branch] + commit_summary = git_command "log --no-color --format='%s' --cherry '%s...%s'" % [ + format, + base_branch.to_s.gsub("'", "\\'"), + remote_branch.to_s.gsub("'", "\\'") + ] end options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg, initial_message, cc| @@ -294,7 +297,7 @@ name, owner = arg, nil owner, name = name.split('/', 2) if name.index('/') project = github_project(name, owner || github_user) - unless ssh || args[0] == 'submodule' || args.noop? || https_protocol? + unless ssh || args[0] == 'submodule' || https_protocol? repo_info = api_client.repo_info(project) ssh = repo_info.success? && (repo_info.data['private'] || repo_info.data['permissions']['push']) end @@ -690,7 +693,7 @@ elsif subpage && !%w[commits tree blob settings].include?(subpage) branch = master_branch project = local_repo.main_project - else + elsif local_repo(false) # $ hub browse prefer_upstream = current_branch && current_branch.master? branch, project = remote_branch_and_project(method(:github_user), prefer_upstream) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hub/context.rb new/lib/hub/context.rb --- old/lib/hub/context.rb 2014-07-11 21:05:58.000000000 +0200 +++ new/lib/hub/context.rb 2014-11-28 01:34:21.000000000 +0100 @@ -355,7 +355,8 @@ end def upstream - if branch = local_repo.git_command("rev-parse --symbolic-full-name #{short_name}@{upstream}") + escaped_name = short_name.gsub("'", "\\'") + if branch = local_repo.git_command("rev-parse --symbolic-full-name '#{escaped_name}@{upstream}'") Branch.new local_repo, branch end end @@ -479,7 +480,10 @@ end def rev_list(a, b) - git_command("rev-list --cherry-pick --right-only --no-merges #{a}...#{b}") + git_command "rev-list --cherry-pick --right-only --no-merges '%s...%s'" % [ + a.to_s.gsub("'", "\\'"), + b.to_s.gsub("'", "\\'") + ] end PWD = Dir.pwd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hub/github_api.rb new/lib/hub/github_api.rb --- old/lib/hub/github_api.rb 2014-07-11 21:05:58.000000000 +0200 +++ new/lib/hub/github_api.rb 2014-11-28 01:34:21.000000000 +0100 @@ -273,13 +273,15 @@ def configure_connection req, url url.scheme = config.protocol(url.host) + url.port = 80 if url.scheme == 'http' if ENV['HUB_TEST_HOST'] req['Host'] = url.host req['X-Original-Scheme'] = url.scheme + req['X-Original-Port'] = url.port url = url.dup url.scheme = 'http' url.host, test_port = ENV['HUB_TEST_HOST'].split(':') - url.port = test_port.to_i if test_port + url.port = test_port ? test_port.to_i : 80 end yield url end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hub/speedy_stdlib.rb new/lib/hub/speedy_stdlib.rb --- old/lib/hub/speedy_stdlib.rb 2014-07-11 21:05:58.000000000 +0200 +++ new/lib/hub/speedy_stdlib.rb 2014-11-28 01:34:21.000000000 +0100 @@ -33,7 +33,9 @@ end module URI - InvalidURIError = Class.new(StandardError) + Error = Class.new(StandardError) + InvalidURIError = Class.new(Error) + InvalidComponentError = Class.new(Error) def self.parse(str) URI::HTTP.new(str) @@ -56,23 +58,24 @@ class HTTP attr_accessor :scheme, :user, :password, :host, :path, :query, :fragment - attr_writer :port + attr_reader :port alias hostname host def initialize(str) m = str.to_s.match(%r{^ ([\w-]+): // (?:([^/@]+)@)? ([^/?#]+) }x) raise InvalidURIError unless m _, self.scheme, self.userinfo, host = m.to_a - self.host, self.port = host.split(':', 2) + self.host, port = host.split(':', 2) + self.port = port ? port.to_i : default_port path, self.fragment = m.post_match.split('#', 2) - self.path, self.query = path.to_s.split('?', 2) + path, self.query = path.split('?', 2) if path + self.path = path.to_s end def to_s url = "#{scheme}://" url << "#{userinfo}@" if user || password - url << host - url << ":#{@port}" if @port + url << host << display_port url << path url << "?#{query}" if query url << "##{fragment}" if fragment @@ -85,8 +88,12 @@ url end - def port - (@port || (scheme == 'https' ? 443 : 80)).to_i + def port=(number) + if number.is_a?(Fixnum) && number > 0 + @port = number + else + raise InvalidComponentError, "bad component(expected port component): %p" % number + end end def userinfo=(info) @@ -102,6 +109,20 @@ def find_proxy end + + private + + def default_port + self.scheme == 'https' ? 443 : 80 + end + + def display_port + if port != default_port + ":#{port}" + else + "" + end + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hub/version.rb new/lib/hub/version.rb --- old/lib/hub/version.rb 2014-07-11 21:05:58.000000000 +0200 +++ new/lib/hub/version.rb 2014-11-28 01:34:21.000000000 +0100 @@ -1,3 +1,3 @@ module Hub - Version = VERSION = '1.12.2' + Version = VERSION = '1.12.3' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2014-07-11 21:05:58.000000000 +0200 +++ new/metadata 2014-11-28 01:34:21.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: hub version: !ruby/object:Gem::Version - version: 1.12.2 + version: 1.12.3 platform: ruby authors: - Chris Wanstrath @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2014-07-11 00:00:00.000000000 Z +date: 2014-11-28 00:00:00.000000000 Z dependencies: [] description: |2 `hub` is a command line utility which adds GitHub knowledge to `git`. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
