octocam 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61efce8fc4172a636811a41aa6decdeab00062c9
-  data.tar.gz: cbfcc063fb9a005dac79e370df55fb5c68f1a9e2
+  metadata.gz: fc7bca552f1d0e63087cea4a7079135f8eb8273d
+  data.tar.gz: f52493aa08f0abf773e73f78e4f4f958277247ab
 SHA512:
-  metadata.gz: 4491e3474ededd50ee5e076f612e6ac326f9dd62d758a0ea60c9e00c4d4f51bf3de93d6c96eada9608c0987323c1f0f6415223998b0b641371f90ec38e02ff3a
-  data.tar.gz: 5808abae53dab9c70b9d79af4f06c759efbbaa9565af6de83cf55365d0e0834834a8eb35867d93d299514995672e187034397ec095080ade12c9315d3b364eea
+  metadata.gz: f94afb8856c8f57aaf40c26b3271a20ab0e738a71f9298c3b6ad3aa1cd4a9180adba873662f5a430e443ba935c83792a480bdf1c888447c49a09570cb2457ca5
+  data.tar.gz: 024a22120ef9a8f83a8096fdfd1e0c81a378e10b7c9e782bf2a3c5c65e0ca17aedbeafd4b3081bce9b1f0ebefd5d64a25619feb9c98952626804e52de0b03efc

data/README.md

@@ -1,28 +1,35 @@
 # Octocam
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/octocam`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Octocam generate simple CHANGELOG with Markdown from GitHub pull requests.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install octocam
 
-```ruby
-gem 'octocam'
-```
+### GitHub Token
 
-And then execute:
+If you want to generate CHANGELOG from private repo, set OCTOCAM_GITHUB_TOKEN to your environment variable.
 
-    $ bundle
+**You can easily [generate it here](https://github.com/settings/applications)**.
 
-Or install it yourself as:
+Then, add to your `~/.bash_profile` or `~/.zshrc` or any other place to load ENV variables string.
 
-    $ gem install octocam
+```
+export OCTOCAM_GITHUB_TOKEN="your-40-digit-github-token"
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+octocam -o zephiransas -r octocam -f 2015-01-01 -t 2015-01-31
+```
+
+```
+-o  (required) owner of the GitHub repository
+-r  (required) name of the GitHub repository
+-f  (required) start of merged at
+-t  (required) end of merged at
+```
 
 ## Development
 
@@ -32,7 +39,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/octocam/fork )
+1. Fork it ( https://github.com/zephiransas/octocam/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/octocam/client.rb

@@ -1,40 +1,20 @@
 require 'octokit'
 require 'optparse'
 require 'time'
+require 'octocam/parser'
 
 class Octocam::Client
 
   def generate
-    args = Argument.new
+    options = Octocam::Parser.parse_options
 
     Octokit.auto_paginate = true
     client = Octokit::Client.new(access_token: ENV['OCTOCAM_GITHUB_TOKEN'])
 
-    pull_requests = client.pull_requests("#{args.owner}/#{args.repository}", state: 'closed').reject{|pr| pr[:merged_at] == nil }
-    pull_requests.select{|pr| pr[:merged_at].localtime >= args.from && pr[:merged_at].localtime <= args.to }.sort{|a, b| -(a[:merged_at] <=> b[:merged_at]) }.each do |pull_request|
+    pull_requests = client.pull_requests("#{options[:owner]}/#{options[:repository]}", state: 'closed').reject{|pr| pr[:merged_at] == nil }
+    pull_requests.select{|pr| pr[:merged_at].localtime >= options[:from] && pr[:merged_at].localtime <= options[:to] }.sort{|a, b| -(a[:merged_at] <=> b[:merged_at]) }.each do |pull_request|
       puts "- #{pull_request[:title]} [[##{pull_request[:number]}](#{pull_request[:html_url]})]"
     end
   end
 
-  class Argument
-    def initialize
-      params = ARGV.getopts('o:r:f:t:')
-      @owner = params['o']
-      @repository = params['r']
-      @from = params['f']
-      @to = params['t']
-    end
-
-    def owner; @owner; end
-    def repository; @repository; end
-
-    def from
-      Time.parse(@from)
-    end
-
-    def to
-      Time.parse(@to)
-    end
-  end
-
 end

data/lib/octocam/parser.rb

@@ -0,0 +1,79 @@
+require 'optparse'
+
+module Octocam
+  class Parser
+    def self.parse_options
+      options = {
+          owner: nil,
+          repository: nil,
+          from: nil,
+          to: nil
+      }
+
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: octocam -o [owner] -r [repository] -f [merged_from] -t [merged_to]'
+
+        opts.accept(Time) do |s|
+          begin
+            Time.parse(s) if s
+          rescue
+            raise "#{s} is not date format. ex) 2015-08-22"
+          end
+        end
+
+        opts.on('-o [NAME]', 'Username of the owner of target GitHub repo') do |v|
+          options[:owner] = v
+        end
+        opts.on('-r [NAME]', 'target repository name') do |v|
+          options[:repository] = v
+        end
+        opts.on('-f YYYY-MM-DD', Time, 'From date of merged date') do |v|
+          options[:from] = v
+        end
+        opts.on('-t YYYY-MM-DD', Time, 'To date of merged date') do |v|
+          options[:to] = v
+        end
+        opts.parse!(ARGV)
+      end
+
+      if !options[:from] || !options[:to]
+        puts parser.banner
+        exit
+      end
+
+      if !options[:owner] || !options[:repository]
+        options[:owner], options[:repository] = detect_owner_and_repository
+      end
+
+      if !options[:owner] || !options[:repository]
+        puts parser.banner
+        exit
+      end
+
+      options
+    end
+
+    private
+
+    def self.detect_owner_and_repository
+      remote = `git config --get remote.origin.url`
+
+      # git@github.com:zephiransas/octocam.git
+      match = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)(?:\.git).*/.match(remote)
+      if match
+        puts "Detected owner:#{match[1]}, repository:#{match[2]}"
+        return [match[1], match[2]]
+      end
+
+      # https://github.com/zephiransas/octocam
+      match = /.*\/((?:-|\w|\.)*)\/((?:-|\w|\.)*).*/.match(remote)
+      if match
+        puts "Detected owner:#{match[1]}, repository:#{match[2]}"
+        return [match[1], match[2]]
+      end
+
+      []
+    end
+
+  end
+end

data/lib/octocam/version.rb

@@ -1,3 +1,3 @@
 module Octocam
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octocam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Takafumi Yoshida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - exe/octocam
 - lib/octocam.rb
 - lib/octocam/client.rb
+- lib/octocam/parser.rb
 - lib/octocam/version.rb
 - octocam.gemspec
 homepage: https://github.com/zephiransas/octocam