sredder 0.0.4 → 0.0.5

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+bin

data/README.md

@@ -16,7 +16,14 @@ Usage: sredder [options]
     -m, --message MESSAGE            The MESSAGE field to add to the wrike task
     -h, --hours N                    The number of HOURS spent on the task
     -d, --date DATE                  The DATE (YY/MM/DD) on which the task was performed (default today)
-    -f, --folder FOLDER              The wrike FOLDER in which to place the task (default Programming)
+    -f, --folder FOLDER              The wrike FOLDER in which to place the task
+                                     (default Programming) Shorthand is:
+                                       'p': Programming
+                                       's': Project Supervision
+                                       'r': Requirements Engineering
+                                       'a': Software architecture and design
+                                       't': Testing
+    -g, --github_id                  The Github Pull Request ID to fetch and parse
         --help                       Show this message
         --version                    Show version
-```
+```

data/lib/sredder/arg_parser.rb

@@ -17,10 +17,14 @@ module Sredder
     end
 
     def valid?
-      options[:date]    &&
-      options[:title]   &&
-      options[:message] &&
-      options[:hours]
+      ( options[:date]    &&
+        options[:title]   &&
+        options[:message] &&
+        options[:hours]
+      ) || (
+        options[:hours] &&
+        options[:github_id]
+      )
     end
 
     # Print the usage and quit
@@ -56,6 +60,11 @@ module Sredder
           options[:folder] = folder
         end
 
+        opts.on("-g", "--github_id ID#",
+                "The Github Pull Request ID to fetch and parse") do |github_id|
+          options[:github_id] = github_id
+        end
+
         opts.on_tail("--help", "Show this message") do
           puts opts
           exit

data/lib/sredder/github_auth.rb

@@ -0,0 +1,53 @@
+require 'oauth'
+require 'forwardable'
+require 'debugger'
+
+module Sredder
+
+  class GithubAuth
+
+    extend Forwardable
+
+    attr_accessor :sredderc
+    attr_writer   :consumer
+
+    def_delegators :sredderc, :credentials, :credentials=
+
+    def initialize(sredderc = Sredderc.new)
+      @sredderc = sredderc
+      @sredderc.load
+    end
+
+    def run_oauth_procedure
+      print "Please enter your github username: "
+      username = $stdin.gets.strip
+      val = `curl -u '#{username}' -d '{"scopes":["repo"],"client_id":"#{client_id}","client_secret":"#{client_secret}"}' https://api.github.com/authorizations`
+      store_tokens(JSON.parse(val)["token"])
+    end
+
+    def authorized?
+      !!credentials[:github_token]
+    end
+
+    def token
+      credentials[:github_token]
+    end
+
+    private
+
+      def client_id
+        'd1f8235b53bd2a2cf37a'
+      end
+
+      def client_secret
+        'b0c2923c4db8d2d7ba36dce1dffa00c88fea4159'
+      end
+
+      def store_tokens(token)
+        self.credentials[:github_token] = token
+        sredderc.save
+      end
+
+  end
+
+end

data/lib/sredder/github_request.rb

@@ -0,0 +1,36 @@
+require 'json'
+require 'net/http'
+require 'uri'
+
+module Sredder
+
+  class GithubRequest
+
+    attr_reader :access_token
+    attr_accessor :response
+
+    def initialize(access_token)
+      @access_token = access_token
+    end
+
+    def get(url)
+      uri = URI.parse("#{url}?access_token=#{@access_token}")
+
+      http = Net::HTTP.new(uri.host, 443)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      @response = http.get(uri.request_uri)
+    end
+
+    def success?
+      response && response.is_a?(Net::HTTPSuccess)
+    end
+
+    def json
+      JSON.parse(@response.body)
+    end
+
+  end
+
+end

data/lib/sredder/sredderc.rb

@@ -1,12 +1,15 @@
+require 'json'
+
 module Sredder
 
   class Sredderc
 
-    attr_accessor :token, :secret
+    attr_accessor :credentials
     attr_reader :file_path
 
     def initialize(path = '~/.sredderc')
       @file_path = File.expand_path(path)
+      @credentials = {}
     end
 
     def exists?
@@ -15,19 +18,15 @@ module Sredder
 
     def load
       if exists?
-        params = File.read(file_path).split
-        self.secret = params[0]
-        self.token  = params[1]
+        @credentials = JSON.parse(IO.read(file_path), :symbolize_names => true)
       end
     end
 
     def save
-      File.open(file_path, 'w') do |f|
-        f.puts(secret)
-        f.puts(token)
-      end
+      json = JSON.dump(@credentials)
+      File.open(file_path, 'w') { |data| data << json }
     end
 
   end
 
-end
+end

data/lib/sredder/version.rb

@@ -1,3 +1,3 @@
 module Sredder
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/sredder/wrike_auth.rb

@@ -1,5 +1,6 @@
 require 'oauth'
 require 'forwardable'
+require 'debugger'
 
 module Sredder
 
@@ -17,7 +18,7 @@ module Sredder
     attr_accessor :sredderc
     attr_writer   :consumer
 
-    def_delegators :sredderc, :token, :token=, :secret, :secret=
+    def_delegators :sredderc, :credentials, :credentials=
 
     def initialize(sredderc = Sredderc.new)
       @sredderc = sredderc
@@ -39,12 +40,12 @@ module Sredder
     end
 
     def authorized?
-      !!token && !!secret
+      !!credentials[:wrike_token] && !!credentials[:wrike_secret]
     end
 
     def oauth_access_token
       if @access_token || authorized?
-        @access_token ||= OAuth::AccessToken.new(consumer, secret, token)
+        @access_token ||= OAuth::AccessToken.new(consumer, credentials[:wrike_token], credentials[:wrike_secret])
       end
     end
 
@@ -64,8 +65,8 @@ module Sredder
 
       def store_tokens(access_token)
         @access_token = access_token
-        self.secret   = access_token.token
-        self.token    = access_token.secret
+        self.credentials[:wrike_secret] = access_token.secret
+        self.credentials[:wrike_token] = access_token.token
         sredderc.save
       end
 

data/lib/sredder/wrike_request.rb

@@ -20,7 +20,7 @@ module Sredder
     end
 
     def success?
-      response && response.is_a?(Net::HTTPSuccess)
+      response && response.is_a?(Net::HTTPSuccess) && !self.json["error"]
     end
 
     def json
@@ -29,4 +29,4 @@ module Sredder
 
   end
 
-end
+end

data/lib/sredder.rb

@@ -4,6 +4,8 @@ require "sredder/util"
 require "sredder/version"
 require "sredder/wrike_auth"
 require "sredder/wrike_request"
+require "sredder/github_auth"
+require "sredder/github_request"
 
 module Sredder
 
@@ -13,6 +15,12 @@ module Sredder
     args_parser.validate!
     options = args_parser.options
 
+    # Github
+    if options[:github_id]
+      get_pull_request(options)
+    end
+
+    # Wrike
     access = get_access_token
     folder_ids = get_folder(access, options[:folder])
     task_id = create_task(access, options[:title], options[:message], folder_ids)
@@ -38,6 +46,9 @@ module Sredder
       request.json["foldersTree"]["folders"].each_with_object([]) do |folder, arr|
         arr << folder['id'].to_i if folder['fullPath'] =~ regex
       end
+    else
+      puts request.json
+      puts 'Invalid response from Wrike'
     end
   end
 
@@ -64,24 +75,18 @@ module Sredder
     })
   end
 
+  ### Github
+  def self.get_pull_request(options)
+    auth = GithubAuth.new
+    auth.run_oauth_procedure unless auth.authorized?
 
-  # def self.run_oauth
-  #   auth = WrikeAuth.new
-  #   auth.run_oauth_procedure unless auth.authorized?
-
-
-  #   parents = self.get_folder(auth.oauth_access_token)
+    request = GithubRequest.new(auth.token)
+    request.get("https://api.github.com/repos/cloudClinic/cloudClinic-Server/pulls/#{options[:github_id]}")
 
-  #   req = WrikeRequest.new(auth.oauth_access_token)
-  #   puts req.post('/api/json/v2/wrike.task.add', {title: 'ermahgerd ruby', description: 'blah blah blah', parents: parents}).body
+    options[:title] = request.json["title"]
+    options[:message] = request.json["body"]
 
-  #   req2 = WrikeRequest.new(auth.oauth_access_token)
-  #   puts req2.post('/api/json/v2/wrike.timelog.add', {
-  #     date: Util.time_stamp,
-  #     taskId: req.json["task"]["id"],
-  #     hours: 3.5,
-  #     comment: 'lolz'
-  #   })
-  # end
+    options
+  end
 
-end
+end

data/spec/sample.sredderc

@@ -1,2 +1 @@
-secret
-token
+{"wrike_secret":"secret","wrike_token":"token"}

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+# require 'debugger'
 
 RSpec.configure do |config|
   config.before :all do
@@ -15,4 +16,4 @@ RSpec.configure do |config|
     @orig_stderr = nil
     @orig_stdout = nil
   end
-end
+end

data/spec/sredder/arg_parser_spec.rb

@@ -46,6 +46,16 @@ describe Sredder::ArgParser do
       result[:date].should == Sredder::Util.time_stamp(time)
     end
 
+    it 'parses a github id as an integer' do
+      github_id = '120'
+
+      result = parser.parse(['-g', github_id])
+      result[:github_id].should == '120'
+
+      result = parser.parse(['--github_id', github_id])
+      result[:github_id].should == '120'
+    end
+
     it 'it can print the help message' do
       lambda { parser.parse(['--help']) }.should raise_error SystemExit
     end
@@ -79,6 +89,14 @@ describe Sredder::ArgParser do
         ])
       parser.valid?.should be_true
     end
+
+    it 'returns true if a github pull request ID is set' do
+      parser.parse([
+          '-g', '120',
+          '-h', '1'
+        ])
+      parser.valid?.should be_true
+    end
   end
 
   describe '#validate!' do
@@ -93,4 +111,4 @@ describe Sredder::ArgParser do
     end
   end
 
-end
+end

data/spec/sredder/sredderc_spec.rb

@@ -35,8 +35,8 @@ describe Sredder::Sredderc do
     it 'loads the token and secret from the file if it exists' do
       rc = Sredder::Sredderc.new(sample_file)
       rc.load
-      rc.secret.should == 'secret'
-      rc.token.should == 'token'
+      rc.credentials[:wrike_secret].should == 'secret'
+      rc.credentials[:wrike_token].should == 'token'
     end
 
   end
@@ -44,17 +44,15 @@ describe Sredder::Sredderc do
   describe '#save' do
 
     it 'writes the data to the file' do
-      io_stub = stub('io')
-      io_stub.should_receive(:puts).with('secret')
-      io_stub.should_receive(:puts).with('token')
+      io_stub = stub('io',:<< => {})
       File.stub(:open).and_yield(io_stub)
 
       rc = Sredder::Sredderc.new(sample_file)
-      rc.secret = 'secret'
-      rc.token = 'token'
+      rc.credentials[:wrike_secret] = 'secret'
+      rc.credentials[:token] = 'token'
       rc.save
     end
 
   end
 
-end
+end

data/spec/sredder/wrike_auth_spec.rb

@@ -6,30 +6,25 @@ describe Sredder::WrikeAuth do
 
   let(:auth) { Sredder::WrikeAuth.new }
 
-  it 'delegates token= to its sredderc' do
-    auth.token = 'banana'
-    auth.sredderc.token.should == 'banana'
-  end
-
-  it 'delegates secret= to its sredderc' do
-    auth.secret = 'banana'
-    auth.sredderc.secret.should == 'banana'
+  it 'delegates credentials= to its sredderc' do
+    auth.credentials[:wrike_token] = 'banana'
+    auth.sredderc.credentials[:wrike_token].should == 'banana'
   end
 
   describe '#authorized?' do
 
     it 'returns false if the token and secret attrs not are set' do
-      auth.token = nil
-      auth.secret = 'blah'
+      auth.credentials[:wrike_token] = nil
+      auth.credentials[:wrike_secret] = 'blah'
       auth.authorized?.should be_false
     end
 
     it 'returns true if the token and secret attrs are set' do
-      auth.token = 'blah'
-      auth.secret = 'blah'
+      auth.credentials[:wrike_token] = 'blah'
+      auth.credentials[:wrike_secret] = 'blah'
       auth.authorized?.should be_true
     end
 
   end
 
-end
+end

data/spec/sredder_spec.rb

@@ -7,4 +7,4 @@ describe Sredder do
 #    Sredder.run_oauth
   end
 
-end
+end

data/sredder.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'oauth'
 
   gem.add_development_dependency 'rspec'
-
+  gem.add_development_dependency 'debugger'
 
 end

metadata

@@ -2,14 +2,14 @@
 name: sredder
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matthew Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,6 +43,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: debugger
+  type: :development
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Sred the gnarl of tracking the wriketious deeds.
 email:
 - matthew@cloudclinic.ca
@@ -57,9 +73,10 @@ files:
 - README.md
 - Rakefile
 - bin/sredder
-- keys.yml
 - lib/sredder.rb
 - lib/sredder/arg_parser.rb
+- lib/sredder/github_auth.rb
+- lib/sredder/github_request.rb
 - lib/sredder/sredderc.rb
 - lib/sredder/util.rb
 - lib/sredder/version.rb

data/keys.yml

@@ -1,3 +0,0 @@
-oauth:
-  key: 119705a437503d196da9eeab675808a4
-  secret: 4216face9995a5d6