tachikoma 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5831a8f436e996a753de8fc6a391c7f372902725
-  data.tar.gz: b8355eba94d70b0902e4a313a3e9f9006f6a6dbc
+  metadata.gz: 10078550dec162c6f28dc1b64a42b98d2f364952
+  data.tar.gz: 388bb16cb73f62cce0ceb293f004cae16f54890b
 SHA512:
-  metadata.gz: eacae9f226657cf252527f3266d91c8ace937182aed4514ed308aa90f4ae28e55aa0236e859c236bdfa3c9e5fd28373fd50455be4b44fd34b7b8bc25cfd8936e
-  data.tar.gz: e24be4920aabea89393a85c55427bd6cedefa52b8166097554c66da0103e996565a8af6f8e3dcd8733e74d9e5f4c3d50bc289dddf81ee0f61496a94ca2c77491
+  metadata.gz: 16ae1f0ba56bc5940e052908a6dc205434e7a8dd622fb6b28a2dc7e6876dbab0de0e780e684a484778a1aaf663940ff123b4de03722dcf426bcd09e57c5638f0
+  data.tar.gz: e577b30d83bbda8df93cbfb58cc956f3a35c892bbb0920d5fe5932bb1199adb34e8bba201dbb0884588f24c18c1e2886f72a098f62dc2400f11daf27142bf354

data/lib/tachikoma/version.rb

@@ -1,3 +1,3 @@
 module Tachikoma
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/tasks/app.rake

@@ -1,8 +1,7 @@
-require 'httparty'
-require 'multi_json'
 require 'safe_yaml'
 require 'uri'
 require 'tachikoma'
+require 'octokit'
 
 namespace :tachikoma do
   # deprecated, this will be removed v3.1.0
@@ -28,11 +27,6 @@ namespace :tachikoma do
     path.sub(%r!^/[^/]+!) { '/' + github_account }
   end
 
-  def target_url(fetch_url)
-    uri = URI.parse(fetch_url)
-    'https://api.github.com/repos/' + uri.path.sub(%r!^/(.*)\.git$!) { $1 } + '/pulls'
-  end
-
   def target_repository_user(type, fetch_url, github_account)
     if type == 'fork'
       github_account
@@ -44,6 +38,10 @@ namespace :tachikoma do
     end
   end
 
+  def repository_identity(url)
+    %r!((?:[^/]*?)/(?:[^/]*?))(?:\.git)?$!.match(url)[1]
+  end
+
   task :load do
     @build_for = ENV['BUILD_FOR']
     @github_token = ENV[github_token_key(@build_for)]
@@ -64,28 +62,19 @@ namespace :tachikoma do
     @commiter_name = @configure['commiter_name']
     @commiter_email = @configure['commiter_email']
     @github_account = @configure['github_account']
-    @fetch_url = @configure['url']
+    @url = @configure['url']
+    @type = @configure['type']
     @base_remote_branch = @configure['base_remote_branch']
-    @authorized_url = authorized_url_with_type(@fetch_url, @configure['type'], @github_token, @github_account)
+    @authorized_url = authorized_url_with_type(@url, @type, @github_token, @github_account)
     @timestamp_format = @configure['timestamp_format'] || @default_timestamp_format
     @readable_time = Time.now.utc.strftime(@timestamp_format)
 
-    @target_url = target_url(@fetch_url)
-    @headers = {
-      'User-Agent' => "Tachikoma #{@github_account}",
-      'Authorization' => "token #{@github_token}",
-      'Accept' => 'application/json',
-      'Content-type' => 'application/json',
-    }
-    @target_head = target_repository_user(@configure['type'], @fetch_url, @github_account)
+    @target_head = target_repository_user(@type, @url, @github_account)
+    @pull_request_url = repository_identity(@url)
     @pull_request_body = @configure['pull_request_body']
     @pull_request_base = @configure['pull_request_base']
-    @body = MultiJson.dump({
-      title: "Bundle update #{@readable_time}",
-      body: @pull_request_body,
-      head: "#{@target_head}:feature/bundle-#{@readable_time}",
-      base: @pull_request_base,
-    })
+    @pull_request_head = "#{@target_head}:feature/bundle-#{@readable_time}"
+    @pull_request_title = "Bundle update #{@readable_time}"
   end
 
   task :clean do
@@ -95,13 +84,14 @@ namespace :tachikoma do
 
   desc 'fetch'
   task fetch: :clean do
-    sh "git clone #{@fetch_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
+    sh "git clone #{@url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
   end
 
   desc 'bundle'
   task :bundle do
     Dir.chdir("#{Tachikoma.repos_path.to_s}/#{@build_for}") do
       Bundler.with_clean_env do
+        sh %Q!sed -i -e 's/^ruby/#ruby/' Gemfile!
         sh "git config user.name #{@commiter_name}"
         sh "git config user.email #{@commiter_email}"
         sh "git checkout -b feature/bundle-#{@readable_time} #{@base_remote_branch}"
@@ -116,11 +106,7 @@ namespace :tachikoma do
 
   desc 'pull_request'
   task :pull_request do
-    puts @headers
-    puts @body
-    response = HTTParty.post(@target_url, headers: @headers, body: @body)
-    unless response.created?
-      fail "Do not create pull request yet. #{response.code} #{response.message} #{response.body}"
-    end
+    @client = Octokit::Client.new(login: @github_account, oauth_token: @github_token)
+    @client.create_pull_request(@pull_request_url, @pull_request_base, @pull_request_head, @pull_request_title, @pull_request_body)
   end
 end

data/tachikoma.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'multi_json'
   spec.add_dependency 'safe_yaml'
   spec.add_dependency 'rake'
+  spec.add_dependency 'octokit'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'dotenv'

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
-  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: multi_json
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='