git_httpsable-push 0.0.1.beta → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65fb15539c1071c5fd91383d3b190e89cc29a25
-  data.tar.gz: 6514248574d76fe39b9ebab139177e6bac2720ae
+  metadata.gz: d1b5925cced6faeef5e5a123474739743d4d2a24
+  data.tar.gz: 8aef2e3b5fd5106156f0572e8b0e090d99a4eeec
 SHA512:
-  metadata.gz: 1e97a4f3fc0f0bf0bfe82241f14bcd701595c3d6c45921e17b8e11153bddbbfe13f7ec722f7ee291160a34acb6c06f4a17557a48d60300653e61f6a7739ede76
-  data.tar.gz: bff98611e7ba657c8369da5115a4835749daf3d3a405c93194732045533dd4a57f851e3bbe22184e35ad1cac06157de981425da300e3f8a6b7aed07535753784
+  metadata.gz: d557dad3c3b6b192843ef58529d108e08860f6cbf40bf1c113c762ba05355122d83094d2888250dcae09802f5142db743b86d83d17ec1078a08ad233961af897
+  data.tar.gz: 1b863f6d2e91e22f98bf118a991a0d3fd963cb39f75326c8fccce4485c15d3313d0ecc896d234cc5862c2f302ae4757f17966ff962358e500a5dadf05c176698

data/.rubocop.yml

@@ -0,0 +1,17 @@
+AllCops:
+  Exclude:
+    - 'bundle_bin/*'
+    - 'vendor/bundle/**/*'
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+
+Style/FileName:
+  Exclude:
+    - exe/*
+
+Style/RegexpLiteral:
+  MaxSlashes: 0

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 0.1.0 (2015-03-06)
+
+
+#### Features
+
+* **app:** release

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in git_httpsable-push.gemspec
 gemspec
+gem 'byebug' if RUBY_VERSION >= '2.0.0'
+gem 'pry'

data/README.md

@@ -3,9 +3,79 @@
 [![Gem Version](http://img.shields.io/gem/v/git_httpsable-push.svg?style=flat)](http://badge.fury.io/rb/git_httpsable-push)
 [![Build Status](http://img.shields.io/travis/packsaddle/ruby-git_httpsable-push/master.svg?style=flat)](https://travis-ci.org/packsaddle/ruby-git_httpsable-push)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/git_httpsable/push`. To experiment with that code, run `bin/console` for an interactive prompt.
+## Description
 
-TODO: Delete this and the text above, and describe your gem
+* Easy to set up `git push` via `https://...`.
+* Keep your `git push` via https **Safely**.
+
+## Usage
+
+require `GITHUB_ACEESS_TOKEN`.
+
+```bash
+# like git push
+$ git httpsable-push origin master
+```
+
+Whether you set `git://...` or `https://...` or `git@...`, you can push via `https://...`.
+
+And this always masks your token.
+
+e.g.
+
+```
+$ git config --get remote.origin.url
+git@github.com:packsaddle/ruby-git_httpsable-push.git
+# GITHUB_ACCESS_TOKEN=__MY_TOKEN__
+
+# success
+$ git httpsable-push origin refactor/logger-to-class --verbose
+I, [2015-03-06T19:29:54.250481 #33391]  INFO -- GitHttpsable::Push: Starting Git
+I, [2015-03-06T19:29:54.270408 #33391]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' config '--list'  2>&1
+I, [2015-03-06T19:29:54.281424 #33391]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' config '--list'  2>&1
+I, [2015-03-06T19:29:56.632766 #33391]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' push 'https://MASKED@github.com/packsaddle/ruby-git_httpsable-push.git' 'refactor/logger-to-class'  2>&1
+I, [2015-03-06T19:29:56.632944 #33391]  INFO -- GitHttpsable::Push: {:output=>nil}
+
+# error occurs
+$ git httpsable-push origin refactor/logger-to-class --verbose
+I, [2015-03-06T19:33:47.692967 #34984]  INFO -- GitHttpsable::Push: Starting Git
+I, [2015-03-06T19:33:47.701617 #34984]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' config '--list'  2>&1
+I, [2015-03-06T19:33:47.711167 #34984]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' config '--list'  2>&1
+I, [2015-03-06T19:33:50.657268 #34984]  INFO -- GitHttpsable::Push: git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' push 'https://MASKED@github.com/packsaddle/ruby-git_httpsable-push.git' 'refactor/logger-to-class'  2>&1
+E, [2015-03-06T19:33:50.657632 #34984] ERROR -- GitHttpsable::Push: Have a question? Please ask us:
+E, [2015-03-06T19:33:50.657667 #34984] ERROR -- GitHttpsable::Push: https://github.com/packsaddle/ruby-git_httpsable-push/issues/new
+E, [2015-03-06T19:33:50.657711 #34984] ERROR -- GitHttpsable::Push: options:
+E, [2015-03-06T19:33:50.657778 #34984] ERROR -- GitHttpsable::Push: {"debug"=>false, "verbose"=>true, "force"=>false, "tags"=>false}
+/Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/git-1.2.9.1/lib/git/lib.rb:917:in `command': (Git::GitExecuteError) git '--git-dir=/Users/sane/work/ruby-study/git_httpsable-push/.git' '--work-tree=/Users/sane/work/ruby-study/git_httpsable-push' push 'https://MASKED@github.com/packsaddle/ruby-git_httpsable-push.git' 'refactor/logger-to-class'  2>&1:remote: Invalid username or password. (GitHttpsable::Push::GitHttpsablePushError)
+fatal: Authentication failed for 'https://MASKED@github.com/packsaddle/ruby-git_httpsable-push.git/'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/git-1.2.9.1/lib/git/lib.rb:727:in `push'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/git-1.2.9.1/lib/git/base.rb:329:in `push'
+        from /Users/sane/work/ruby-study/git_httpsable-push/lib/git_httpsable/push/repository.rb:24:in `push'
+        from /Users/sane/work/ruby-study/git_httpsable-push/lib/git_httpsable/push/cli.rb:29:in `push'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/command.rb:27:in `run'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/invocation.rb:126:in `invoke_command'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor.rb:359:in `dispatch'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/base.rb:440:in `start'
+        from /Users/sane/work/ruby-study/git_httpsable-push/lib/git_httpsable/push/cli.rb:59:in `method_missing'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/command.rb:29:in `run'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/command.rb:126:in `run'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/invocation.rb:126:in `invoke_command'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor.rb:359:in `dispatch'
+        from /Users/sane/work/ruby-study/git_httpsable-push/vendor/bundle/ruby/2.2.0/gems/thor-0.19.1/lib/thor/base.rb:440:in `start'
+        from exe/git-httpsable-push:5:in `<main>'
+```
+
+## VS.
+
+* `git push --quiet`, set remote url manually, error to `/dev/null`
+
+```
+$ git push --quiet https://$GH_TOKEN@github.com/<repos_name>.git gh-pages 2> /dev/null
+```
+
+This can push safely,
+but if you forgot `--quiet` or `2> /dev/null`,
+then you open your token to the world :(
 
 ## Installation
 
@@ -23,10 +93,6 @@ Or install it yourself as:
 
     $ gem install git_httpsable-push
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. Run `bundle exec git_httpsable-push` to use the code located in this directory, ignoring other installed copies of this gem.

data/exe/git-httpsable-push

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'git_httpsable/push'
+require 'git_httpsable/push/cli'
+GitHttpsable::Push::CLI.start(ARGV)

data/git_httpsable-push.gemspec

@@ -29,7 +29,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'git'
+  spec.add_runtime_dependency 'git_clone_url'
+
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'mocha'
 end

data/lib/git_httpsable/push.rb

@@ -1,7 +1,27 @@
+require 'logger'
+require 'git'
+require 'uri'
+require 'git_clone_url'
+
+require 'git_httpsable/push/error'
+require 'git_httpsable/push/mask_logger'
+require 'git_httpsable/push/repository'
 require 'git_httpsable/push/version'
 
 module GitHttpsable
   module Push
-    # Your code goes here...
+    ISSUE_URL = 'https://github.com/packsaddle/ruby-git_httpsable-push/issues/new'
+    def self.default_logger
+      MaskLogger.new($stderr)
+    end
+
+    def self.logger
+      return @logger if @logger
+      @logger = default_logger
+    end
+
+    class << self
+      attr_writer :logger
+    end
   end
 end

data/lib/git_httpsable/push/cli.rb

@@ -0,0 +1,64 @@
+require 'thor'
+
+module GitHttpsable
+  module Push
+    class CLI < Thor
+      def self.exit_on_failure?
+        true
+      end
+
+      desc 'version', 'Show the GitHttpsable::Push version'
+      map %w(-v --version) => :version
+
+      def version
+        puts "GitHttpsable::Push version #{::GitHttpsable::Push::VERSION}"
+      end
+
+      desc 'push', 'Git Push via HTTPS'
+      option :debug, type: :boolean, default: false
+      option :verbose, type: :boolean, default: false
+      option :force, type: :boolean, default: false, aliases: '-f'
+      option :tags, type: :boolean, default: false
+      def push(*args)
+        setup_logger(options)
+        params = {
+          force: options[:force],
+          tags: options[:tags]
+        }
+        repo = Repository.new('.')
+        repo.push(args[0], args[1], params)
+      rescue StandardError => e
+        suggest_messages(options)
+        raise e
+      end
+      default_command :push
+
+      no_commands do
+        def logger
+          ::GitHttpsable::Push.logger
+        end
+
+        def setup_logger(options)
+          if options[:debug]
+            logger.level = Logger::DEBUG
+          elsif options[:verbose]
+            logger.level = Logger::INFO
+          end
+          logger.debug(options)
+        end
+
+        def suggest_messages(options)
+          logger.error 'Have a question? Please ask us:'
+          logger.error ISSUE_URL
+          logger.error 'options:'
+          logger.error options
+        end
+
+        # http://stackoverflow.com/a/23955971/104080
+        def method_missing(method, *args)
+          self.class.start([self.class.default_command, method.to_s] + args)
+        end
+      end
+    end
+  end
+end

data/lib/git_httpsable/push/error.rb

@@ -0,0 +1,17 @@
+module GitHttpsable
+  module Push
+    class GitHttpsablePushError < StandardError
+      def initialize(message = nil)
+        return super unless message
+        super(mask_token(message.to_s))
+      end
+
+      def mask_token(text)
+        text.gsub(%r{://[^/@]*@}) { '://MASKED@' }
+      end
+    end
+
+    class NotExistRemoteUrlError < GitHttpsablePushError; end
+    class NoAuthDataError < GitHttpsablePushError; end
+  end
+end

data/lib/git_httpsable/push/mask_logger.rb

@@ -0,0 +1,21 @@
+module GitHttpsable
+  module Push
+    class MaskLogger < Logger
+      def initialize(*args)
+        super(*args)
+        self.progname = "GitHttpsable::Push/#{VERSION}"
+        self.level = Logger::WARN
+        self.formatter = proc do |severity, datetime, progname, msg|
+          @default_formatter.call(
+            severity,
+            datetime,
+            progname,
+            msg.to_s.gsub(%r{://[^/@]*@}) { '://MASKED@' }
+          )
+        end
+
+        self
+      end
+    end
+  end
+end

data/lib/git_httpsable/push/repository.rb

@@ -0,0 +1,76 @@
+module GitHttpsable
+  module Push
+    class Repository
+      def initialize(path, options = {})
+        @path = path
+        @options = { log: logger }.merge(options)
+      end
+
+      def push(remote = 'origin', branch = 'master', options = {})
+        logger.debug(remote: remote, branch: branch, options: options)
+        # check current branch's upstream remote and branch?
+        url = remote_url(remote)
+        fail NotExistRemoteUrlError, %(no "#{remote}" url) unless url
+        parsed = GitCloneUrl.parse(url)
+
+        converted_url = \
+          URI::Generic.build(
+            scheme: scheme,
+            userinfo: userinfo,
+            host: host(parsed.host),
+            port: port,
+            path: parsed.path
+          )
+        git.push(converted_url.to_s, branch, options)
+      rescue StandardError => e
+        raise e if e.is_a?(GitHttpsablePushError)
+
+        exception = GitHttpsablePushError.new('(' + e.class.name + ') ' + e.message)
+        exception.set_backtrace(e.backtrace)
+        raise exception
+      end
+
+      def logger
+        ::GitHttpsable::Push.logger
+      end
+
+      def git
+        @git ||= ::Git.open(@path, @options)
+      end
+
+      def remote_url(remote)
+        git.remote(remote) && git.remote(remote).url
+      end
+
+      def env_github_access_token
+        ENV['GITHUB_ACCESS_TOKEN']
+      end
+
+      def env_git_access_token
+        ENV['GIT_SERVER_ACCESS_TOKEN']
+      end
+
+      def userinfo
+        if env_git_access_token
+          env_git_access_token
+        elsif env_github_access_token
+          "#{env_github_access_token}:x-oauth-basic"
+        else
+          fail NoAuthDataError
+        end
+      end
+
+      def scheme
+        ENV['GIT_SERVER_SCHEME'] || 'https'
+      end
+
+      def host(host)
+        ENV['GIT_SERVER_HOST'] || host
+      end
+
+      def port
+        ENV['GIT_SERVER_PORT'] || nil
+      end
+    end
+  end
+end

data/lib/git_httpsable/push/version.rb

@@ -1,5 +1,5 @@
 module GitHttpsable
   module Push
-    VERSION = '0.0.1.beta'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: git_httpsable-push
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta
+  version: 0.1.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  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
+  name: git
+  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
+  name: git_clone_url
+  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
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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'
 description: "`git push` to https repo securely."
 email:
 - o.gata.ken@gmail.com
@@ -61,6 +117,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -71,6 +129,10 @@ files:
 - exe/git-httpsable-push
 - git_httpsable-push.gemspec
 - lib/git_httpsable/push.rb
+- lib/git_httpsable/push/cli.rb
+- lib/git_httpsable/push/error.rb
+- lib/git_httpsable/push/mask_logger.rb
+- lib/git_httpsable/push/repository.rb
 - lib/git_httpsable/push/version.rb
 homepage: https://github.com/packsaddle/ruby-git_httpsable-push
 licenses:
@@ -87,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5