tukune 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8eeb756b92ae9e7bc02d2d46628172de826a24
-  data.tar.gz: 1f382801f54a7311e21091ea41baede08179b4d3
+  metadata.gz: 73d08b6076a382f4cf209647056bfcce7a43f133
+  data.tar.gz: 99146e70bef2a37a55df7cc8b72f83087a4d7485
 SHA512:
-  metadata.gz: 8b6b1afb41a8ad6e67255f9fdf59cc03c76847e054124589fec0f2011a8dd2dad439e4234ee3eda4adc6f08a34a870966bcc0af7ee2c24ab9f6f8f825a0fd920
-  data.tar.gz: 34ae658de6d2e7eee6d7d48e8810be478fb8d2b0ec04c03bd17e7c6c72114a603b7f2101717fc81b4c98c7e7084506d6136c5ee78b7c9e8d94862b7e956cd11a
+  metadata.gz: c1e7cddf73594634ccb4cddb30f5653b0f2be8f54ccbff0084a9821933aca170dc91d19926e13c645ff85e6a129e5a475072f447563a013df17989a0d431ca84
+  data.tar.gz: 5f0cc1005ff747072627982110e0066fdc7910bc27cf7845f47fbe0dda7103d83a1c0bd052333e9763fa339840992d346ca154a68c6fe2d8289bab005cf7878d

data/README.md

@@ -1,4 +1,5 @@
-# [WIP]Tukune
+# Tukune
+[![Gem Version](https://badge.fury.io/rb/tukune.svg)](https://badge.fury.io/rb/tukune)
 [![Build Status](https://travis-ci.org/gin0606/tukune.svg?branch=master)](https://travis-ci.org/gin0606/tukune)
 [![Coverage Status](https://coveralls.io/repos/github/gin0606/tukune/badge.svg?branch=master)](https://coveralls.io/github/gin0606/tukune?branch=master)
 
@@ -43,6 +44,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
+### TODO
+- [ ] testing
+- [ ] refactoring
+
 ## Contributing
 1. Fork it ( https://github.com/gin0606/tukune/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/bin/tukune

@@ -18,6 +18,10 @@ opt_parser = OptionParser.new do |opt|
     options[:body] = body
   end
 
+  opt.on('--enable-all') do |enable_all|
+    options[:enable_all] = enable_all
+  end
+
   opt.on('-h', '--help', 'help') do
     puts opt_parser
   end

data/lib/github.rb

@@ -0,0 +1,137 @@
+require 'octokit'
+require 'mem'
+
+class Github
+  include Mem
+
+  def initialize(repo, current_branch = 'master')
+    @repo = repo
+    @current_branch_name = current_branch
+    @branch = BranchCache.new(repo)
+  end
+
+  def branch(name)
+    current_branch = @branch.read(@current_branch_name)
+    @branch.create(name, current_branch[:object][:sha])
+  end
+
+  def checkout(branch)
+    @current_branch_name = branch
+    @branch.read(@current_branch_name)
+  end
+
+  def add(path)
+    added_files << path
+  end
+
+  def commit(message)
+    current_branch = @branch.read(@current_branch_name)
+
+    tree = create_tree(current_branch[:object][:sha])
+    new_commit = client.create_commit(@repo, message, tree[:sha], current_branch[:object][:sha])
+
+    @branch.update(@current_branch_name, new_commit[:sha])
+    added_files.clear
+
+    new_commit
+  end
+
+  def pull_request(base, title, body)
+    client.create_pull_request(
+      @repo,
+      base,
+      @current_branch_name,
+      title,
+      body
+    )
+  end
+
+  private
+
+  def create_tree(branch_sha)
+    tree_helper = TreeHelper.new(@repo, branch_sha)
+    added_files.each { |path| tree_helper.add(path) }
+    tree_helper.create_tree
+  end
+
+  def added_files
+    []
+  end
+  memoize :added_files
+
+  def client
+    ::Octokit::Client.new
+  end
+  memoize :client
+
+  class BranchCache
+    include Mem
+
+    def initialize(repo)
+      @repo = repo
+      @cache = {}
+    end
+
+    def create(name, sha)
+      @cache[name] = client.create_ref(@repo, "heads/#{name}", sha)
+    end
+
+    def read(name)
+      @cache[name] = client.ref(@repo, "heads/#{name}")
+    end
+
+    def update(name, sha)
+      @cache[name] = client.update_branch(@repo, name, sha)
+    end
+
+    def delete(name)
+      ref = client.delete_ref(@repo, "heads/#{name}")
+      @cache.delete(name)
+      ref
+    end
+
+    private
+
+    def client
+      ::Octokit::Client.new
+    end
+    memoize :client
+  end
+
+  class TreeHelper
+    include Mem
+
+    def initialize(repo, branch_sha)
+      @repo = repo
+      @branch_sha = branch_sha
+    end
+
+    def add(path)
+      content = Base64.encode64(File.read(path))
+      sha = client.create_blob(@repo, content, 'base64')
+      tree << { path: path, mode: '100644', type: 'blob', sha: sha }
+    end
+
+    def create_tree
+      client.create_tree(@repo, tree, base_tree: current_tree[:sha])
+    end
+
+    private
+
+    def current_tree
+      commit = client.commit(@repo, @branch_sha)
+      client.tree(@repo, commit[:commit][:tree][:sha], recursive: true)
+    end
+    memoize :current_tree
+
+    def tree
+      []
+    end
+    memoize :tree
+
+    def client
+      ::Octokit::Client.new
+    end
+    memoize :client
+  end
+end

data/lib/tukune.rb

@@ -1,7 +1,7 @@
+require 'github'
 require 'tukune/cli'
 require 'tukune/configuration'
 require 'tukune/git/diff'
-require 'tukune/git/commit'
 require 'tukune/version'
 
 module Tukune

data/lib/tukune/cli.rb

@@ -2,33 +2,37 @@ module Tukune
   class CLI
     class << self
       def start(options)
-        if Tukune.configuration.tukune_branch?
+        config = Tukune.configuration
+        diff = Tukune::Git::Diff.name_status
+        if config.tukune_branch?
           puts 'this branch is tukune'
           return
         end
-        unless Tukune.configuration.pull_request?
+        unless options[:enable_all] || config.pull_request?
           puts 'This build is not part of pull request.'
           puts 'If you want to exec tukune, try to use `--enable-all` option.'
           return
         end
-        diff = Tukune::Git::Diff.name_status
         if diff.nothing_to_commit?
           puts 'nothing to commit, working directory clean'
           return
         end
-        c = Tukune::Git::Commit.new(Tukune.configuration)
+
+        github = Github.new(config.repository_name, config.current_branch)
+        github.branch(config.feature_branch)
+        github.checkout(config.feature_branch)
+
         diff.modified_files.each do |f|
-          c.add(f)
-          puts "Create #{f} blob."
+          github.add(f)
+          puts "Create #{f}."
         end
         diff.added_files.each do |f|
-          c.add(f)
-          puts "Create #{f} blob."
+          github.add(f)
+          puts "Create #{f}."
         end
-        # diff.deleted_files.each {|f| c.delete(f) }
-        c.commit("#{options[:title]}\n\n#{options[:body]}")
+        p github.commit("#{options[:title]}\n\n#{options[:body]}")
         puts 'Create commit'
-        c.pull_request(options[:title], options[:body])
+        github.pull_request(config.current_branch, options[:title], options[:body])
         puts 'Create pull request'
       end
     end

data/lib/tukune/version.rb

@@ -1,3 +1,3 @@
 module Tukune
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/tukune.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'octokit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tukune
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - gin0606
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -111,7 +111,10 @@ dependencies:
 description: Create a pull request if there is a difference via Github API
 email:
 - kkgn06@gmail.com
-executables: []
+executables:
+- console
+- setup
+- tukune
 extensions: []
 extra_rdoc_files: []
 files:
@@ -127,13 +130,13 @@ files:
 - bin/console
 - bin/setup
 - bin/tukune
+- lib/github.rb
 - lib/tukune.rb
 - lib/tukune/cli.rb
 - lib/tukune/configuration.rb
 - lib/tukune/configuration/circle_ci.rb
 - lib/tukune/configuration/default.rb
 - lib/tukune/configuration/travis_ci.rb
-- lib/tukune/git/commit.rb
 - lib/tukune/git/diff.rb
 - lib/tukune/version.rb
 - tukune.gemspec

data/lib/tukune/git/commit.rb

@@ -1,113 +0,0 @@
-require 'octokit'
-require 'mem'
-
-module Tukune
-  module Git
-    class Commit
-      include Mem
-
-      def initialize(configuration)
-        @repository_name = configuration.repository_name
-        @current_branch = configuration.current_branch
-        @feature_branch = configuration.feature_branch
-      end
-
-      def add(file_path)
-        content = Base64.encode64(File.read(file_path))
-        sha = client.create_blob(@repository_name, content, 'base64')
-        blobs[file_path] = sha
-      end
-
-      def delete(file_path)
-        delete_files << file_path
-      end
-
-      def commit(message)
-        tree =  if delete_files.empty?
-                  create_tree(changed_blobs)
-                else
-                  create_tree_with_delete_files(changed_blobs)
-                end
-
-        commits << client.create_commit(@repository_name, message, tree[:sha], current_branch[:object][:sha])
-      end
-
-      def pull_request(title, body)
-        create_feature_branch(@feature_branch, commits.last[:sha])
-        client.create_pull_request(
-          @repository_name,
-          @current_branch,
-          @feature_branch,
-          title,
-          body
-        )
-      end
-
-      private
-
-      def create_tree(changed_blobs)
-        client.create_tree(@repository_name, changed_blobs, base_tree: current_tree[:sha])
-      end
-
-      # FIXME: can not commit correctly if exist delete_files
-      def create_tree_with_delete_files(changed_blobs)
-        changed_files = blobs.map { |path, _| path }
-
-        # trees = current_tree[:tree].map(&:to_h)
-        # trees = current_tree[:tree].map(&:to_h).delete_if { |blob| delete_files.include?(blob[:path]) }
-        trees = current_tree[:tree].map(&:to_h)
-                                   .delete_if { |blob| delete_files.include?(blob[:path]) }
-                                   .delete_if { |blob| changed_files.include?(blob[:path]) }
-        trees += changed_blobs
-
-        client.create_tree(@repository_name, trees)
-      end
-
-      def current_tree
-        commit = client.commit(@repository_name, current_branch[:object][:sha])
-        client.tree(@repository_name, commit[:commit][:tree][:sha], recursive: true)
-      end
-      memoize :current_tree
-
-      def current_branch
-        client.ref(@repository_name, "heads/#{@current_branch}")
-      end
-      memoize :current_branch
-
-      def create_feature_branch(name, sha)
-        client.create_ref(@repository_name, "heads/#{name}", sha)
-      end
-
-      def commits
-        []
-      end
-      memoize :commits
-
-      def blobs
-        {}
-      end
-      memoize :blobs
-
-      def changed_blobs
-        blobs.map do |file_path, sha|
-          {
-            path: file_path,
-            mode: '100644',
-            type: 'blob',
-            sha: sha
-          }
-        end
-      end
-
-      def delete_files
-        []
-      end
-      memoize :delete_files
-
-      def client
-        ::Octokit::Client.new
-      end
-      memoize :client
-    end
-  end
-end