tachikoma 3.0.9 → 4.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e6f428a116e0b20d4d756fc680d968ea04e605
-  data.tar.gz: 26a1bb99ae789f27c1d5cf65675469117df829f2
+  metadata.gz: 375f94bff68ee9047e05548e60d560fa03d6b1ac
+  data.tar.gz: ce691da02a80091a3f347e5cdc8f2e6ad014a6b5
 SHA512:
-  metadata.gz: 8008055c18b785c4c07ece26005059a287f93dc709aa7169ee7543597c73824738897416174fb7402401b58f03f32e9ca95f07d6ad5e4c283a00900e5555af5e
-  data.tar.gz: 5e104ea39226c482b15d1e344bcce4448837871aa3871203b2c7ff5229b3f1f327cef94ca422873928699cfa3a9783825bf18a07155590f2fa61c0096f5ab04c
+  metadata.gz: 0a3174bbe78ccc371cba4cfa1d683f46dc871e4f5d900d0f2f5dc8cbee753994e522358ebc024fa4edb79e82737ae9438e16462a81b4885484a89b58bd782839
+  data.tar.gz: 0a24c3ed371fcc85567b92601dac71362712fee337b8bc1850b1268814eba6da972a196bd3a4d43aab010f30d669e5c01a51fea5292403138e1dbb9a55f64907

data/README.md

@@ -6,8 +6,8 @@
 
 Daily Pull Requester with bundle/carton update. [Actual pull request](https://github.com/mrtaddy/fenix-knight/pull/25)
 
-[![screen shot 2013-07-22 at 8 09 29 am](https://f.cloud.github.com/assets/75448/832475/b0ce829a-f25a-11e2-8984-521dbe7d838e.png)](https://vimeo.com/70733613)
-
+![tachikoma](https://gist.github.com/sanemat/6605029/raw/ztachikoma-demo5.gif 'tachikoma')
+![tachikoma](https://gist.github.com/sanemat/6605029/raw/ztachikoma-demo6.gif 'tachikoma')
 
 ## Usage as gem
 
@@ -27,15 +27,52 @@ $ bundle exec tachikoma init
 2. Add YAML of repository you want to build by Tachikoma: Copy `data/bot-motoko-tachikoma.yaml` then edit `url` and `type`. to clone URL of your repository. Change `type` to `shared`, if you use shared repository model.
 3. Run below command in your shell:
 
+Above v4.0.0.beta
+
+```
+$ export BUILD_FOR=<your-repository-name-that-is-same-to-yaml-filename>
+$ export TOKEN_YOUR_REPOSITORY_NAME_THAT_IS_SAME_TO_YAML_FILENAME=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+$ bundle exec rake tachikoma:run_bundle
+```
+
+If you use carton, then you use `tachikoma:run_carton` instead of `tachikoma:run_bundle`.
+
+__Breaking backward compatibility__
+
+Below v3.1 Old API
+
 ```
 $ export BUILD_FOR=<your-repository-name-that-is-same-to-yaml-filename>
 $ export TOKEN_YOUR_REPOSITORY_NAME_THAT_IS_SAME_TO_YAML_FILENAME=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 $ bundle exec rake tachikoma:load tachikoma:fetch tachikoma:bundle tachikoma:pull_request
 ```
 
+If you use carton, then you use `tachikoma:carton` instead of `tachikoma:bundle`. (Require version >= 3.0.9)
+
+### Setting example
+[gist-mail setting (data/gist-mail.yaml)](https://github.com/sanemat/bot-motoko-tachikoma/blob/a47ceb8b88f8b6da8028e5c0b641b8a84c9c3505/data/gist-mail.yaml)
+
+```yaml
+url:
+  'https://github.com/sanemat/gist-mail.git'
+frequency:
+  "every 1.day, :at => '6:30 am'"
+type:
+  'fork'
+language:
+  'ruby'
+version:
+  '2.0.0'
+pull_request_body:
+  ':ideograph_advantage::ideograph_advantage::ideograph_advantage:'
+```
+
 ### Build script example
+- [cloudbees.com dev@cloud: Above v4.0.0.beta](https://gist.github.com/sanemat/5859031/aa1966a46a7c00ed975b487f423c36b8ae5b976d)
 
-- [cloudbees.com dev@cloud](https://gist.github.com/sanemat/5859031)
+__Breaking backward compatibility__
+
+- [cloudbees.com dev@cloud: Below v3.1 Old API](https://gist.github.com/sanemat/5859031/31ac68266f89bc12760180d024874bd778f6946a)
 
 ## Versioning
 
@@ -58,3 +95,27 @@ For more information on SemVer, please visit http://semver.org.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Resources
+
+### Concept
+- [Continuous gem dependency updating with Jenkins and Pull Request](http://rubykaigi.org/2013/talk/S72)
+at Rubykaigi2013 Talk
+by @kyanny
+[movie](http://vimeo.com/68300423) _Japanese_
+[slide](https://speakerdeck.com/kyanny/continuous-gem-dependency-updating-with-jenkins-and-pull-request) _English/Japanese_
+
+### Screencast
+- Tachikoma 10min (Below v3.1 - Old API) _Silent_
+[![screen shot 2013-07-22 at 8 09 29 am](https://f.cloud.github.com/assets/75448/832475/b0ce829a-f25a-11e2-8984-521dbe7d838e.png)](https://vimeo.com/70733613)
+
+### Talk
+- [Updating Library Dependencies Off and On with Tachikoma](http://yapcasia.org/2013/talk/show/f7fe8ed4-1bcd-11e3-93a2-f74c6aeab6a4)
+at YAPC::Asia Tokyo 2013 Lightning Talk
+by @sanemat
+[slide](https://gist.github.com/sanemat/6605029) _Japanese_
+[video](http://www.youtube.com/watch?v=IAoJzxBzOok) _Japanese_
+
+### Article
+- [tachikoma を使って毎日自動で bundle update - willnet.in](http://willnet.in/111)
+by @willnet (Below v3.1 - Old API) _Japanese_

data/lib/tachikoma/application.rb

@@ -0,0 +1,154 @@
+require 'safe_yaml'
+require 'uri'
+require 'tachikoma'
+require 'octokit'
+require 'fileutils'
+
+module Tachikoma
+  class Application
+    include FileUtils
+
+    def self.run(strategy)
+      new.run(strategy)
+    end
+
+    def run(strategy)
+      load
+      fetch
+      send(strategy) if respond_to?(strategy)
+      pull_request
+    end
+
+    def load
+      @build_for = ENV['BUILD_FOR']
+      @github_token = ENV[github_token_key(@build_for)]
+
+      base_config_path = File.join(Tachikoma.original_data_path, 'default.yaml')
+      base_config = YAML.safe_load_file(base_config_path) || {}
+      user_config_path = File.join(Tachikoma.data_path, '__user_config__.yaml')
+      user_config = YAML.safe_load_file(user_config_path) if File.exist?(user_config_path)
+      user_config ||= {}
+      each_config_path = File.join(Tachikoma.data_path, "#{@build_for}.yaml")
+      each_config = YAML.safe_load_file(each_config_path) if File.exist?(each_config_path)
+      unless each_config
+        fail %Q!Something wrong, BUILD_FOR: #{@build_for}, your config_path: #{each_config_path}!
+      end
+
+      @configure = base_config.merge(user_config).merge(each_config)
+
+      @commiter_name = @configure['commiter_name']
+      @commiter_email = @configure['commiter_email']
+      @github_account = @configure['github_account']
+      @url = @configure['url']
+      @type = @configure['type']
+      @base_remote_branch = @configure['base_remote_branch']
+      @authorized_url = authorized_url_with_type(@url, @type, @github_token, @github_account)
+      @timestamp_format = @configure['timestamp_format']
+      @readable_time = Time.now.utc.strftime(@timestamp_format)
+      @parallel_option = bundler_parallel_option(Bundler::VERSION, @configure['bundler_parallel_number'])
+
+      @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']
+      @pull_request_head = "#{@target_head}:feature/bundle-#{@readable_time}"
+      @pull_request_title = "Bundle update #{@readable_time}"
+    end
+
+    def clean
+      mkdir_p(Tachikoma.repos_path)
+      rm_rf(Dir.glob(File.join(Tachikoma.repos_path, '*')))
+    end
+
+    def fetch
+      clean
+      if @type == 'private'
+        sh "git clone #{@authorized_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
+      else
+        sh "git clone #{@url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
+      end
+    end
+
+    def bundle
+      Dir.chdir("#{Tachikoma.repos_path.to_s}/#{@build_for}") do
+        Bundler.with_clean_env do
+          sh %Q|ruby -i -pe '$_.gsub! /^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}"
+          sh "bundle --gemfile Gemfile --no-deployment --without nothing #{@parallel_option}"
+          sh 'bundle update'
+          sh 'git add Gemfile.lock'
+          sh %Q!git commit -m "Bundle update #{@readable_time}"! do; end # ignore exitstatus
+          sh "git push #{@authorized_url} feature/bundle-#{@readable_time}"
+        end
+      end
+    end
+
+    def carton
+      Dir.chdir("#{Tachikoma.repos_path.to_s}/#{@build_for}") do
+        sh "git config user.name #{@commiter_name}"
+        sh "git config user.email #{@commiter_email}"
+        sh "git checkout -b feature/carton-#{@readable_time} #{@base_remote_branch}"
+        sh 'carton install'
+        sh 'carton update'
+        sh 'git add carton.lock' if File.exist?('carton.lock')
+        sh 'git add cpanfile.snapshot' if File.exist?('cpanfile.snapshot')
+        sh %Q!git commit -m "Carton update #{@readable_time}"! do; end # ignore exitstatus
+        sh "git push #{@authorized_url} feature/carton-#{@readable_time}"
+      end
+    end
+
+    def pull_request
+      begin
+        @client = Octokit::Client.new access_token: @github_token
+        @client.create_pull_request(@pull_request_url, @pull_request_base, @pull_request_head, @pull_request_title, @pull_request_body)
+      rescue Octokit::UnprocessableEntity
+      end
+    end
+
+    # build_for = fenix-knight, github_token_key = TOKEN_FENIX_KNIGHT
+    def github_token_key(build_for)
+      "TOKEN_#{build_for}".gsub(/-/, '_').upcase
+    end
+
+    def authorized_url_with_type(fetch_url, type, github_token, github_account)
+      uri = URI.parse(fetch_url)
+      case type
+      when 'fork'
+        %Q!#{uri.scheme}://#{github_token}@#{uri.host}#{path_for_fork(uri.path, github_account)}!
+      when 'shared', 'private'
+        "#{uri.scheme}://#{github_token}@#{uri.host}#{uri.path}"
+      else
+        raise "Invalid type #{type}"
+      end
+    end
+
+    def path_for_fork(path, github_account)
+      path.sub(%r!^/[^/]+!) { '/' + github_account }
+    end
+
+    def target_repository_user(type, fetch_url, github_account)
+      case type
+      when 'fork'
+        github_account
+      when 'shared', 'private'
+        uri = URI.parse(fetch_url)
+        uri.path.sub(%r!/([^/]+)/.*!) { $1 }
+      else
+        raise "Invalid type #{type}"
+      end
+    end
+
+    def repository_identity(url)
+      %r!((?:[^/]*?)/(?:[^/]*?))(?:\.git)?$!.match(url)[1]
+    end
+
+    def bundler_parallel_option(bundler_version, parallel_number)
+      # bundler 1.4.0.pre.1 gets parallel number option
+      if Gem::Version.create(bundler_version) >= Gem::Version.create('1.4.0.pre.1') && parallel_number > 1
+        "--jobs=#{parallel_number}"
+      end
+    end
+  end
+end

data/lib/tachikoma/version.rb

@@ -1,4 +1,4 @@
 # Version of tachikoma
 module Tachikoma
-  VERSION = '3.0.9'
+  VERSION = '4.0.0.rc.1'
 end

data/lib/tasks/app.rake

@@ -1,144 +1,29 @@
-require 'safe_yaml'
-require 'uri'
-require 'tachikoma'
-require 'octokit'
+require 'tachikoma/application'
 
 namespace :tachikoma do
-  # deprecated, this will be removed v3.1.0
-  @default_timestamp_format = '%Y%m%d%H%M%S'
-
-  # build_for = fenix-knight, github_token_key = TOKEN_FENIX_KNIGHT
-  def github_token_key(build_for)
-    "TOKEN_#{build_for}".gsub(/-/, '_').upcase
-  end
-
-  def authorized_url_with_type(fetch_url, type, github_token, github_account)
-    uri = URI.parse(fetch_url)
-    case type
-    when 'fork'
-      %Q!#{uri.scheme}://#{github_token}@#{uri.host}#{path_for_fork(uri.path, github_account)}!
-    when 'shared', 'private'
-      "#{uri.scheme}://#{github_token}@#{uri.host}#{uri.path}"
-    else
-      raise "Invalid type #{type}"
-    end
-  end
-
-  def path_for_fork(path, github_account)
-    path.sub(%r!^/[^/]+!) { '/' + github_account }
-  end
-
-  def target_repository_user(type, fetch_url, github_account)
-    case type
-    when 'fork'
-      github_account
-    when 'shared', 'private'
-      uri = URI.parse(fetch_url)
-      uri.path.sub(%r!/([^/]+)/.*!) { $1 }
-    else
-      raise "Invalid type #{type}"
-    end
+  desc 'run tachikoma'
+  task :run_bundle do
+    Tachikoma::Application.run 'bundle'
   end
 
-  def repository_identity(url)
-    %r!((?:[^/]*?)/(?:[^/]*?))(?:\.git)?$!.match(url)[1]
-  end
-
-  def bundler_parallel_option(bundler_version, parallel_number)
-    # bundler 1.4.0.pre.1 gets parallel number option
-    if Gem::Version.create(bundler_version) >= Gem::Version.create('1.4.0.pre.1') && parallel_number > 1
-      "--jobs=#{parallel_number}"
-    end
+  task :run_carton do
+    Tachikoma::Application.run 'carton'
   end
 
   task :load do
-    @build_for = ENV['BUILD_FOR']
-    @github_token = ENV[github_token_key(@build_for)]
-
-    base_config_path = File.join(Tachikoma.original_data_path, 'default.yaml')
-    base_config = YAML.safe_load_file(base_config_path) || {}
-    user_config_path = File.join(Tachikoma.data_path, '__user_config__.yaml')
-    user_config = YAML.safe_load_file(user_config_path) if File.exist?(user_config_path)
-    user_config ||= {}
-    each_config_path = File.join(Tachikoma.data_path, "#{@build_for}.yaml")
-    each_config = YAML.safe_load_file(each_config_path) if File.exist?(each_config_path)
-    unless each_config
-      fail %Q!Something wrong, BUILD_FOR: #{@build_for}, your config_path: #{each_config_path}!
-    end
-
-    @configure = base_config.merge(user_config).merge(each_config)
-
-    @commiter_name = @configure['commiter_name']
-    @commiter_email = @configure['commiter_email']
-    @github_account = @configure['github_account']
-    @url = @configure['url']
-    @type = @configure['type']
-    @base_remote_branch = @configure['base_remote_branch']
-    @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)
-    @parallel_option = bundler_parallel_option(Bundler::VERSION, @configure['bundler_parallel_number'])
-
-    @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']
-    @pull_request_head = "#{@target_head}:feature/bundle-#{@readable_time}"
-    @pull_request_title = "Bundle update #{@readable_time}"
-  end
-
-  task :clean do
-    mkdir_p(Tachikoma.repos_path)
-    rm_rf(Dir.glob(File.join(Tachikoma.repos_path, '*')))
   end
 
-  desc 'fetch'
-  task fetch: :clean do
-    if @type == 'private'
-      sh "git clone #{@authorized_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
-    else
-      sh "git clone #{@url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
-    end
+  task :fetch do
   end
 
-  desc 'bundle'
   task :bundle do
-    Dir.chdir("#{Tachikoma.repos_path.to_s}/#{@build_for}") do
-      Bundler.with_clean_env do
-        sh %Q|ruby -i -pe '$_.gsub! /^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}"
-        sh "bundle --gemfile Gemfile --no-deployment --without nothing #{@parallel_option}"
-        sh 'bundle update'
-        sh 'git add Gemfile.lock'
-        sh %Q!git commit -m "Bundle update #{@readable_time}"! do; end # ignore exitstatus
-        sh "git push #{@authorized_url} feature/bundle-#{@readable_time}"
-      end
-    end
+    Tachikoma::Application.run 'bundle'
   end
 
-  desc 'carton'
   task :carton do
-    Dir.chdir("#{Tachikoma.repos_path.to_s}/#{@build_for}") do
-      sh "git config user.name #{@commiter_name}"
-      sh "git config user.email #{@commiter_email}"
-      sh "git checkout -b feature/carton-#{@readable_time} #{@base_remote_branch}"
-      sh 'carton install'
-      sh 'carton update'
-      sh 'git add carton.lock' if File.exist?('carton.lock')
-      sh 'git add cpanfile.snapshot' if File.exist?('cpanfile.snapshot')
-      sh %Q!git commit -m "Carton update #{@readable_time}"! do; end # ignore exitstatus
-      sh "git push #{@authorized_url} feature/carton-#{@readable_time}"
-    end
+    Tachikoma::Application.run 'carton'
   end
 
-  desc 'pull_request'
   task :pull_request do
-    begin
-      @client = Octokit::Client.new access_token: @github_token
-      @client.create_pull_request(@pull_request_url, @pull_request_base, @pull_request_head, @pull_request_title, @pull_request_body)
-    rescue Octokit::UnprocessableEntity
-    end
   end
 end

data/spec/tachikoma/application_spec.rb

@@ -0,0 +1,48 @@
+require 'tachikoma'
+require 'tachikoma/application'
+require 'fileutils'
+
+describe Tachikoma::Application do
+  before :all do
+    ENV.update({ 'BUILD_FOR' => 'test' })
+    open(File.join(File.dirname(__FILE__), '..', '..', 'data', 'test.yaml'), 'w') { |f|
+      f.puts <<YAML
+url:
+  'https://github.com/sanemat/bot-motoko-tachikoma.git'
+type:
+  'fork'
+YAML
+    }
+  end
+
+  after :all do
+    ENV.update({ 'BUILD_FOR' => nil })
+    FileUtils.rm_f File.join(File.dirname(__FILE__), '..', '..', 'data', 'test.yaml')
+  end
+
+  context 'if strategy is `bundle`' do
+    before do
+      Tachikoma::Application.any_instance.stub(:load)
+      Tachikoma::Application.any_instance.stub(:fetch)
+      Tachikoma::Application.any_instance.stub(:pull_request)
+    end
+
+    it 'should be called `bundle` method' do
+      Tachikoma::Application.any_instance.should_receive(:bundle)
+      Tachikoma::Application.run 'bundle'
+    end
+  end
+
+  context 'if strategy is `carton`' do
+    before do
+      Tachikoma::Application.any_instance.stub(:load)
+      Tachikoma::Application.any_instance.stub(:fetch)
+      Tachikoma::Application.any_instance.stub(:pull_request)
+    end
+
+    it 'should be called `carton` method' do
+      Tachikoma::Application.any_instance.should_receive(:carton)
+      Tachikoma::Application.run 'carton'
+    end
+  end
+end

data/tachikoma.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Tachikoma::VERSION
   spec.authors       = ['sanemat']
   spec.email         = ['o.gata.ken@gmail.com']
-  spec.description   = %q{Interval pull requester with bundle update.}
+  spec.description   = %q{Interval pull requester with bundle/carton update.}
   spec.summary       = %q{Update gem frequently gets less pain. Let's doing bundle update as a habit!}
   spec.homepage      = 'https://github.com/sanemat/tachikoma'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 4.0.0.rc.1
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -114,7 +114,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0.rc
-description: Interval pull requester with bundle update.
+description: Interval pull requester with bundle/carton update.
 email:
 - o.gata.ken@gmail.com
 executables:
@@ -135,12 +135,14 @@ files:
 - bin/tachikoma
 - data/default.yaml
 - lib/tachikoma.rb
+- lib/tachikoma/application.rb
 - lib/tachikoma/settings.rb
 - lib/tachikoma/tasks.rb
 - lib/tachikoma/version.rb
 - lib/tasks/app.rake
 - rubocop-todo.yml
 - spec/spec_helper.rb
+- spec/tachikoma/application_spec.rb
 - spec/tachikoma/settings_spec.rb
 - spec/tasks/app_task_spec.rb
 - tachikoma.gemspec
@@ -159,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.8
@@ -170,5 +172,6 @@ specification_version: 4
 summary: Update gem frequently gets less pain. Let's doing bundle update as a habit!
 test_files:
 - spec/spec_helper.rb
+- spec/tachikoma/application_spec.rb
 - spec/tachikoma/settings_spec.rb
 - spec/tasks/app_task_spec.rb