[DRE-commits] [gist] 01/06: Imported Upstream version 4.1.3

Christian Hofstaedtler zeha at moszumanska.debian.org
Mon Dec 2 23:01:15 UTC 2013


This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository gist.

commit 91e246cc3430ad605dd3ecf11491e1ded42e960d
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 2 23:51:30 2013 +0100

    Imported Upstream version 4.1.3
---
 README.md         |  14 ++++-
 build/gist        |  13 ++--
 checksums.yaml.gz | Bin 268 -> 0 bytes
 gist.gemspec      |   1 -
 lib/gist.rb       |  11 +++-
 metadata.yml      | 181 ++++++++++++++++++++++++++++--------------------------
 6 files changed, 124 insertions(+), 96 deletions(-)

diff --git a/README.md b/README.md
index 1838ad2..07693b4 100644
--- a/README.md
+++ b/README.md
@@ -72,11 +72,23 @@ an OAuth2 token (with the "gist" permission).
     Obtaining OAuth2 access_token from github.
     GitHub username: ConradIrwin
     GitHub password:
+    2-factor auth code:
     Success! https://github.com/settings/applications
 
+You can read the 2-factor auth code from an sms or the authentification app,
+depending on how you [set your account up](https://github.com/settings/admin).
+
+Note: 2-factor authentication
+[just appeared recently](https://github.com/blog/1614-two-factor-authentication),
+so if you run into errors, update the gist gem.
+
+    gem update gist
+
 This token is stored in `~/.gist` and used for all future gisting. If you need to
 you can revoke it from https://github.com/settings/applications, or just delete the
-file.
+file.  If you need to store tokens for both github.com and a Github Enterprise instance 
+you can save your Github Enterprise token in `~/.gist.github.example.com` where 
+"github.example.com" is the URL for your Github Enterprise instance.
 
 ‌After you've done this, you can still upload gists anonymously with `-a`.
 
diff --git a/build/gist b/build/gist
index 7ac2168..cb66dd4 100755
--- a/build/gist
+++ b/build/gist
@@ -3,7 +3,10 @@
 # any changes will be overwritten.
 require 'net/https'
 require 'cgi'
-require 'strscan'
+require 'uri'
+
+begin
+  require 'strscan'
 
 module JSON
   module Pure
@@ -1307,18 +1310,20 @@ end
 
 JSON.generator = JSON::Pure::Generator
 JSON.parser    = JSON::Pure::Parser
-require 'uri'
+rescue LoadError
+  require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'json.rb'
+end
 
 # It just gists.
 module Gist
   extend self
 
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
     'xclip'   => 'xclip -o',
-    'xsel'    => 'xsel -o',
+    'xsel -i'    => 'xsel -o',
     'pbcopy'  => 'pbpaste',
     'putclip' => 'getclip'
   }
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
deleted file mode 100644
index e7cb0a9..0000000
Binary files a/checksums.yaml.gz and /dev/null differ
diff --git a/gist.gemspec b/gist.gemspec
index 2cb9721..dbc41be 100644
--- a/gist.gemspec
+++ b/gist.gemspec
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 
   s.executables << 'gist'
 
-  s.add_dependency 'json'
   %w(rake rspec webmock ronn).each do |gem|
     s.add_development_dependency gem
   end
diff --git a/lib/gist.rb b/lib/gist.rb
index 81d1756..74dfbbb 100644
--- a/lib/gist.rb
+++ b/lib/gist.rb
@@ -1,18 +1,23 @@
 require 'net/https'
 require 'cgi'
-require 'json'
 require 'uri'
 
+begin
+  require 'json'
+rescue LoadError
+  require File.join File.dirname(File.dirname(__FILE__)), 'vendor', 'json.rb'
+end
+
 # It just gists.
 module Gist
   extend self
 
-  VERSION = '4.1.1'
+  VERSION = '4.1.3'
 
   # A list of clipboard commands with copy and paste support.
   CLIPBOARD_COMMANDS = {
     'xclip'   => 'xclip -o',
-    'xsel'    => 'xsel -o',
+    'xsel -i'    => 'xsel -o',
     'pbcopy'  => 'pbpaste',
     'putclip' => 'getclip'
   }
diff --git a/metadata.yml b/metadata.yml
index b289894..eb298d3 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,95 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gist
-version: !ruby/object:Gem::Version
-  version: 4.1.1
+version: !ruby/object:Gem::Version 
+  hash: 61
+  prerelease: 
+  segments: 
+  - 4
+  - 1
+  - 3
+  version: 4.1.3
 platform: ruby
-authors:
+authors: 
 - Conrad Irwin
-- ☈king
+- !binary |
+  4piIa2luZw==
+
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  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
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ronn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ronn
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Provides a single function (Gist.gist) that uploads a gist.
-email:
+email: 
 - conrad.irwin at gmail.com
 - rkingist at sharpsaw.org
-executables:
+executables: 
 - gist
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -109,27 +106,37 @@ files:
 - spec/spec_helper.rb
 - vendor/json.rb
 homepage: https://github.com/defunkt/gist
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Just allows you to upload gists
 test_files: []
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gist.git



More information about the Pkg-ruby-extras-commits mailing list