tachikoma 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959855b32d57d8fc65b695bbe828aebdb721d7dd
-  data.tar.gz: d87489d289f3f15d46865ce921654fc932269a65
+  metadata.gz: 5831a8f436e996a753de8fc6a391c7f372902725
+  data.tar.gz: b8355eba94d70b0902e4a313a3e9f9006f6a6dbc
 SHA512:
-  metadata.gz: 2db323e982a2e86c168eeaaf854f28d942ff0c61a1f18bb0fb2cbe03b7468ef73fbfd4183984b653e68003b5e97fd0b495b369f82cf9aa9c909ef1f17e9931bc
-  data.tar.gz: 4b5d8134ff072bbb2019f79746abbc3c5b671faf3aaa29b0a853296257e499704668008a34d36889ac91a6cfda0744410bca968597408297fc802775196497e9
+  metadata.gz: eacae9f226657cf252527f3266d91c8ace937182aed4514ed308aa90f4ae28e55aa0236e859c236bdfa3c9e5fd28373fd50455be4b44fd34b7b8bc25cfd8936e
+  data.tar.gz: e24be4920aabea89393a85c55427bd6cedefa52b8166097554c66da0103e996565a8af6f8e3dcd8733e74d9e5f4c3d50bc289dddf81ee0f61496a94ca2c77491

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_install:
+  - gem update bundler
+notifications:
+  email:
+    - ogataken@gmail.com
+branches:
+  only:
+    - master

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-ruby '2.0.0'
 # Specify your gem's dependencies in tachikoma.gemspec
 gemspec
 

data/README.md

@@ -1,6 +1,10 @@
 # Tachikoma
 
-Daily Pull Requester with bundle update
+[![Gem Version](https://badge.fury.io/rb/tachikoma.png)](http://badge.fury.io/rb/tachikoma)
+[![Build Status](https://api.travis-ci.org/sanemat/tachikoma.png?branch=master)](https://travis-ci.org/sanemat/tachikoma)
+[![Code Climate](https://codeclimate.com/github/sanemat/tachikoma.png)](https://codeclimate.com/github/sanemat/tachikoma)
+
+Daily Pull Requester with bundle update. [Actual pull request](https://github.com/mrtaddy/fenix-knight/pull/25)
 
 ## Usage as gem
 
@@ -26,6 +30,10 @@ $ export TOKEN_YOUR_REPOSITORY_NAME_THAT_IS_SAME_TO_YAML_FILENAME=xxxxxxxxxxxxxx
 $ bundle exec rake tachikoma:load tachikoma:fetch tachikoma:bundle tachikoma:pull_request
 ```
 
+### Build script example
+
+- [cloudbees.com dev@cloud](https://gist.github.com/sanemat/5859031)
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 require "bundler/gem_tasks"
 require "bundler/gem_helper"
+require 'rspec/core/rake_task'
 
 # http://qiita.com/kyanny/items/2de40ca0b5127a0f5c2a
 #Rake::Task[:release].clear
@@ -18,3 +19,10 @@ if ENV['APP_ENV'] && %w(development test).include?(ENV['APP_ENV'])
   require 'dotenv'
   Dotenv.load
 end
+
+desc 'Run all specs in spec directory'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['-cfd --backtrace']
+end
+
+task default: :spec

data/bin/tachikoma

@@ -15,6 +15,10 @@ require 'tachikoma/tasks'
     EOS
   end
   FileUtils.mkdir_p('data')
+  File.open(File.join('data', '__user_config__.yaml'), 'w') do |f|
+    f << <<-EOS
+    EOS
+  end
   File.open(File.join('data', 'bot-motoko-tachikoma.yaml'), 'w') do |f|
     f << <<-EOS
 url:

data/data/default.yaml

@@ -0,0 +1,14 @@
+commiter_name:
+  'bot-motoko'
+commiter_email:
+  'bot-motoko@al.sane.jp'
+github_account:
+  'bot-motoko'
+base_remote_branch:
+  'origin/master'
+timestamp_format:
+  '%Y%m%d%H%M%S'
+pull_request_body:
+  ':hamster::hamster::hamster:'
+pull_request_base:
+  'master'

data/lib/tachikoma/settings.rb

@@ -1,30 +1,42 @@
 require 'pathname'
 
 module Tachikoma
-  # ~/users-tachikoma-dir
-  def self.root_path
-    @root_path ||= Pathname.new(Dir.pwd)
-  end
+  class << self
+    # ~/users-tachikoma-dir
+    def root_path
+      @root_path ||= Pathname.new Dir.pwd
+    end
 
-  def self.root_path=(root_path)
-    @root_path = Pathname.new File.expand_path(root_path)
-  end
+    def root_path=(root_path)
+      @root_path = Pathname.new File.expand_path(root_path)
+    end
 
-  # ~/users-tachikoma-dir/data
-  def self.data_path
-    @data_path ||= root_path.join('data')
-  end
+    # ~/users-tachikoma-dir/data
+    def data_path
+      @data_path ||= root_path.join('data')
+    end
 
-  def self.data_path=(data_path)
-    @data_path = Pathname.new File.expand_path(data_path)
-  end
+    def data_path=(data_path)
+      @data_path = Pathname.new File.expand_path(data_path)
+    end
 
-  # ~/users-tachikoma-dir/repos
-  def self.repos_path
-    @repos_path ||= root_path.join('repos')
-  end
+    # ~/users-tachikoma-dir/repos
+    def repos_path
+      @repos_path ||= root_path.join('repos')
+    end
+
+    def repos_path=(repos_path)
+      @repos_path = Pathname.new File.expand_path(repos_path)
+    end
+
+    # /path/to/gem/tachikoma
+    def original_root_path
+      @original_root_path ||= Pathname.new File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+    end
 
-  def self.repos_path=(repos_path)
-    @repos_path = Pathname.new File.expand_path(repos_path)
+    # /path/to/gem/tachikoma/data
+    def original_data_path
+      @original_data_path ||= original_root_path.join('data')
+    end
   end
 end

data/lib/tachikoma/version.rb

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

data/lib/tasks/app.rake

@@ -5,6 +5,7 @@ require 'uri'
 require 'tachikoma'
 
 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
@@ -32,9 +33,9 @@ namespace :tachikoma do
     'https://api.github.com/repos/' + uri.path.sub(%r!^/(.*)\.git$!) { $1 } + '/pulls'
   end
 
-  def target_repository_user(type, fetch_url, git_name)
+  def target_repository_user(type, fetch_url, github_account)
     if type == 'fork'
-      git_name
+      github_account
     elsif type == 'shared'
       uri = URI.parse(fetch_url)
       uri.path.sub(%r!/([^/]+)/.*!) { $1 }
@@ -46,40 +47,54 @@ namespace :tachikoma do
   task :load do
     @build_for = ENV['BUILD_FOR']
     @github_token = ENV[github_token_key(@build_for)]
-    @git_name = 'bot-motoko'
-    @git_email = 'bot-motoko@al.sane.jp'
-    @configure =
-      YAML.safe_load_file(File.join(Tachikoma.data_path, "#{@build_for}.yaml"))
+
+    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']
     @fetch_url = @configure['url']
-    @base_remote_branch = 'origin/master'
-    @authorized_url = authorized_url_with_type(@fetch_url, @configure['type'], @github_token, @git_name)
-    timestamp_format = @configure['timestamp_format'] || @default_timestamp_format # nil guard
-    timestamp_format = @default_timestamp_format if timestamp_format.empty?        # empty string: ""
-    @readable_time = Time.now.utc.strftime(timestamp_format)
+    @base_remote_branch = @configure['base_remote_branch']
+    @authorized_url = authorized_url_with_type(@fetch_url, @configure['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 #{@git_name}",
+      '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, @git_name)
+    @target_head = target_repository_user(@configure['type'], @fetch_url, @github_account)
+    @pull_request_body = @configure['pull_request_body']
+    @pull_request_base = @configure['pull_request_base']
     @body = MultiJson.dump({
       title: "Bundle update #{@readable_time}",
-      body: ':hamster::hamster::hamster:',
+      body: @pull_request_body,
       head: "#{@target_head}:feature/bundle-#{@readable_time}",
-      base: 'master',
+      base: @pull_request_base,
     })
   end
 
   task :clean do
-    rm_rf(Dir.glob(Tachikoma.repos_path.to_s))
+    mkdir_p(Tachikoma.repos_path)
+    rm_rf(Dir.glob(File.join(Tachikoma.repos_path, '*')))
   end
 
   desc 'fetch'
   task fetch: :clean do
-    mkdir_p(Tachikoma.repos_path.to_s)
     sh "git clone #{@fetch_url} #{Tachikoma.repos_path.to_s}/#{@build_for}"
   end
 
@@ -87,9 +102,8 @@ namespace :tachikoma do
   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 #{@git_name}"
-        sh "git config user.email #{@git_email}"
+        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'
         sh 'bundle update'

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+require 'rspec/autorun'

data/spec/tachikoma/settings_spec.rb

@@ -0,0 +1,16 @@
+require 'tachikoma/settings'
+describe Tachikoma do
+  describe '.root_path' do
+    let(:somewhere) { '/path/to/somewhere' }
+    let(:datapath) { somewhere + '/data'}
+    let(:repospath) { somewhere + '/repos'}
+
+    before :each do
+      Dir.stub(:pwd).and_return(somewhere)
+    end
+
+    it { expect(described_class.root_path).to eq Pathname.new(somewhere) }
+    it { expect(described_class.data_path).to eq Pathname.new(datapath) }
+    it { expect(described_class.repos_path).to eq Pathname.new(repospath) }
+  end
+end

data/tachikoma.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'dotenv'
+  spec.add_development_dependency 'rspec', '>= 2.14.0.rc'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.0.rc
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.0.rc
 description: Interval pull requester with bundle update.
 email:
 - o.gata.ken@gmail.com
@@ -104,17 +118,22 @@ extra_rdoc_files: []
 files:
 - .env.example
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - NOTE.txt
 - README.md
 - Rakefile
 - bin/tachikoma
+- data/default.yaml
 - lib/tachikoma.rb
 - lib/tachikoma/settings.rb
 - lib/tachikoma/tasks.rb
 - lib/tachikoma/version.rb
 - lib/tasks/app.rake
+- spec/spec_helper.rb
+- spec/tachikoma/settings_spec.rb
 - tachikoma.gemspec
 homepage: https://github.com/sanemat/tachikoma
 licenses:
@@ -136,8 +155,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Update gem frequently gets less pain. Let's doing bundle update as a habit!
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/tachikoma/settings_spec.rb