tachikoma 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ddf01cae7d332c30dfe0aa73ecd8af467e402d
-  data.tar.gz: 18b463702ca130fa83aeb7d5b7e42d7d7fb10d89
+  metadata.gz: f618004743a16b2c9bfeab746b69f3edc0488625
+  data.tar.gz: 13ef48e03589ed1aa6959079afdda7d303a7ba3b
 SHA512:
-  metadata.gz: 6e7047d855ae8ffddafd33a8eb07b455fdd97952affd7196eee6b1e1c7ba1cc262441e697893a231e4ef249470ab004de6454f011843a3b4593673128df1218d
-  data.tar.gz: d5e49603c26ab3b7249adb5afd26cab61453d7dda1005c4a2e68ee7cc547dc9956957f959db917d2a6793c654b3c90a8e5ffc0a1e0b6d9a1fc09e3cb096fb651
+  metadata.gz: 039c38ee4a88403b275e3c65044d48d2205c653f586e8a50982bcb50df012bd90559f411d462266b1eae549e163afcdd14e8cc9714ef18e045ba49e9ee9101b6
+  data.tar.gz: 9c22939957a1abe16a6628b851e2bd488d789ad11a40ecc847e9e42d64c9a9d46211f9bd92f33aa4558db9a5aba7880084534b8841f93bcd0b9ce362f655bc1f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.0.2 (2013-12-20)
+
+Features:
+
+  - Support for older git versions (1.7.x) and OAuth (#58, @kenchan)
+  - Adjust rspec 3 syntax (#59, #60, @banyan)
+  - Use Thor, and split template file from script (#61, #63, @sanemat)
+
 ## 4.0.1 (2013-12-07)
 
 Features:

data/Gemfile

@@ -4,6 +4,10 @@ gemspec
 
 group :development, :test do
   gem 'pry'
+  # https://github.com/rspec/rspec-rails/issues/878#issuecomment-30575316
+  gem 'rspec-core', git: 'https://github.com/rspec/rspec-core.git', branch: 'master'
+  # https://github.com/rspec/rspec-mocks/pull/467
+  gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks.git', branch: 'master'
 end
 
 gem 'oj'

data/bin/tachikoma

@@ -1,59 +1,6 @@
 #!/usr/bin/env ruby
-case ARGV[0]
-when 'init'
-  require 'fileutils'
-  File.open('.gitignore', 'a') do |f|
-    f << <<-EOS
-
-/repos/*
-!/repos/.gitkeep
-    EOS
-  end
-  puts 'appended .gitignore'
-  File.open('Rakefile', 'a') do |f|
-    f << <<-EOS
-
 require 'bundler/setup'
-require 'tachikoma/tasks'
-    EOS
-  end
-  puts 'appended Rakefile'
-  FileUtils.mkdir_p('data')
-  puts 'created data/'
-  File.open(File.join('data', '__user_config__.yaml'), 'w') do |f|
-    f << <<-EOS
-    EOS
-  end
-  puts 'created data/__user_config__.yaml'
-  File.open(File.join('data', 'bot-motoko-tachikoma.yaml'), 'w') do |f|
-    f << <<-EOS
-url:
-  'https://github.com/sanemat/bot-motoko-tachikoma.git'
-frequency:
-  "every 1.day, :at => '6:30 am'"
-type:
-  'fork'
-language:
-  'ruby'
-version:
-  '2.0.0'
-    EOS
-  end
-  puts 'created data/bot-motoko-tachikoma.yaml'
-  FileUtils.mkdir_p('repos')
-  puts 'created repos/'
-  FileUtils.touch(File.join('repos', '.gitkeep'))
-  puts 'created repos/.gitkeep'
-  puts 'tachikoma init completed!'
-  puts 'You might want to see README!'
-else
-  puts <<-EOS
-  Command Lists
-  tachikoma init               # Initialize files
+require 'tachikoma'
+require 'tachikoma/cli'
 
-  rake tachikoma:bundle        # bundle
-  rake tachikoma:fetch         # fetch
-  rake tachikoma:fetch_data    # fetch another `/data` directory from another location
-  rake tachikoma:pull_request  # pull_request
-  EOS
-end
+Tachikoma::CLI.start

data/lib/tachikoma/application.rb

@@ -116,9 +116,9 @@ module Tachikoma
       uri = URI.parse(fetch_url)
       case type
       when 'fork'
-        %Q!#{uri.scheme}://#{github_token}@#{uri.host}#{path_for_fork(uri.path, github_account)}!
+        %Q!#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{path_for_fork(uri.path, github_account)}!
       when 'shared', 'private'
-        "#{uri.scheme}://#{github_token}@#{uri.host}#{uri.path}"
+        "#{uri.scheme}://#{github_token}:x-oauth-basic@#{uri.host}#{uri.path}"
       else
         raise "Invalid type #{type}"
       end

data/lib/tachikoma/cli.rb

@@ -0,0 +1,57 @@
+require 'thor'
+
+module Tachikoma
+  class CLI < Thor
+    include Thor::Actions
+
+    desc 'init', 'Initialize files'
+    def init
+      require 'fileutils'
+
+      copy_or_append_file_lists = %w(
+        .gitignore
+        Rakefile
+        data/__user_config__.yaml
+      )
+      copy_file_lists = %w(
+        repos/.gitkeep
+        data/bot-motoko-tachikoma.yaml
+      )
+
+      copy_or_append_file_lists.each do |target|
+        if File.exist?(target)
+          append_to_file target do
+            File.read(File.join(self.class.source_root, target))
+          end
+        else
+          copy_file target
+        end
+      end
+
+      copy_file_lists.each do |target|
+        copy_file target
+      end
+
+      puts 'tachikoma init completed!'
+      puts 'You might want to see README!'
+    end
+
+    def self.help(shell, *)
+      list = printable_tasks
+
+      shell.say 'Commands:'
+      shell.print_table(list, indent: 2, truncate: true)
+      shell.say
+      class_options_help(shell)
+      shell.say <<-USAGE
+Tasks:
+  rake tachikoma:run_bundle  # run tachikoma with bundle
+  rake tachikoma:run_carton  # run tachikoma with carton
+USAGE
+    end
+
+    def self.source_root
+      File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    end
+  end
+end

data/lib/tachikoma/templates/.gitignore

@@ -0,0 +1,3 @@
+
+/repos/*
+!/repos/.gitkeep

data/lib/tachikoma/templates/Rakefile

@@ -0,0 +1,3 @@
+
+require 'bundler/setup'
+require 'tachikoma/tasks'

data/lib/tachikoma/templates/data/bot-motoko-tachikoma.yaml

@@ -0,0 +1,10 @@
+url:
+  'https://github.com/sanemat/bot-motoko-tachikoma.git'
+frequency:
+  "every 1.day, :at => '6:30 am'"
+type:
+  'fork'
+language:
+  'ruby'
+version:
+  '2.0.0'

data/lib/tachikoma/version.rb

@@ -1,4 +1,4 @@
 # Version of tachikoma
 module Tachikoma
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/lib/tasks/app.rake

@@ -1,29 +1,40 @@
 require 'tachikoma/application'
 
 namespace :tachikoma do
-  desc 'run tachikoma'
+  desc 'run tachikoma with bundle'
   task :run_bundle do
     Tachikoma::Application.run 'bundle'
   end
 
+  desc 'run tachikoma with carton'
   task :run_carton do
     Tachikoma::Application.run 'carton'
   end
 
+  # Deprecated: Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead
   task :load do
+    warn '[DEPRECATION] `tachikoma:load` is deleted. Please use `tachikoma:run_bundle` or `tachikoma:run_carton instead.'
   end
 
+  # Deprecated: Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead
   task :fetch do
+    warn '[DEPRECATION] `tachikoma:fetch` is deleted. Please use `tachikoma:run_bundle` or `tachikoma:run_carton instead.'
   end
 
+  # Deprecated: Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead
   task :bundle do
+    warn '[DEPRECATION] `tachikoma:bundle` is deprecated. Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead.'
     Tachikoma::Application.run 'bundle'
   end
 
+  # Deprecated: Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead
   task :carton do
+    warn '[DEPRECATION] `tachikoma:carton` is deprecated. Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead.'
     Tachikoma::Application.run 'carton'
   end
 
+  # Deprecated: Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead
   task :pull_request do
+    warn '[DEPRECATION] `tachikoma:pull_request` is deleted. Please use `tachikoma:run_bundle` or `tachikoma:run_carton` instead.'
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.raise_errors_for_deprecations!
 
   # 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
@@ -14,5 +15,3 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
-
-require 'rspec/autorun'

data/spec/tasks/app_task_spec.rb

@@ -2,22 +2,17 @@ require 'spec_helper'
 require 'rake'
 require 'tachikoma/tasks'
 
-describe 'app.rake' do
-  describe 'tachikoma:pull_request' do
+# FIXME: This is not test against rake task.
+describe 'Tachikoma::Aplication' do
+  describe '#pull_request' do
     context 'when github returns 422 UnprocessableEntity' do
       before do
-        # FIXME: Using `stub_chain` from rspec-mocks' old `:should`
-        #        syntax without explicitly enabling the syntax is deprecated.
-        #        Use the new `:expect` syntax or explicitly enable `:should`
-        #        instead. Called from
-        #        /Users/sane/work/ruby-study/tachikoma/spec/tasks/app_task_spec.rb:9:
-        #        in `block (4 levels) in <top (required)>'.
-        Octokit::Client.stub_chain(:new, :create_pull_request).and_raise(Octokit::UnprocessableEntity)
+        allow(Octokit::Client).to receive_message_chain(:new, :create_pull_request).and_raise(Octokit::UnprocessableEntity)
       end
 
       it 'should not raise Octokit::UnprocessableEntity error' do
         expect {
-          Rake::Task['tachikoma:pull_request'].invoke
+          Tachikoma::Application.new.pull_request
         }.to_not raise_error
       end
     end

data/tachikoma.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake'
   spec.add_dependency 'octokit', '>= 2', '< 3'
   spec.add_dependency 'json'
+  spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'dotenv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tachikoma
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -72,6 +72,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,8 +151,14 @@ files:
 - data/default.yaml
 - lib/tachikoma.rb
 - lib/tachikoma/application.rb
+- lib/tachikoma/cli.rb
 - lib/tachikoma/settings.rb
 - lib/tachikoma/tasks.rb
+- lib/tachikoma/templates/.gitignore
+- lib/tachikoma/templates/Rakefile
+- lib/tachikoma/templates/data/__user_config__.yaml
+- lib/tachikoma/templates/data/bot-motoko-tachikoma.yaml
+- lib/tachikoma/templates/repos/.gitkeep
 - lib/tachikoma/version.rb
 - lib/tasks/app.rake
 - rubocop-todo.yml