githabit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9303dc97c43cd6836a029bcc958b0f3b659473
-  data.tar.gz: b4dca1dfbc88a367d4818d9b37e6df024fbc3ece
+  metadata.gz: 3693ae5c5c9621047ecc21a8df57c2c37814ca79
+  data.tar.gz: e96c70e3c28390bafe7f33e718c1a3b6f8961995
 SHA512:
-  metadata.gz: dd51de3f4f89fa833d722240a1d2822690ad095b8941fbc899a66f1fd90bc252ef14807ac029f2deadc3c3072a2d0825a7fdad43cf769ebf4efad9ede92e7e20
-  data.tar.gz: a2d87f3be416d747a5d35e56335b8140f237cb58e7775357a3ce2fb117424b8a4475ba78a19278de96525ea5443bcbcf389beeb04dab427396a9d385a4701112
+  metadata.gz: ffe42c81766b352cad25ac2e9d76281d5870197fb3223a7aea2e384a936519aa920168f3ceb4773edf94a49fa46bf849ce6cb8a239a4363d7c20dc20b6f2b207
+  data.tar.gz: 8621efbbac931617a25ad015fc08705ab95aef5c1fdcdbc24eac4bc4efd1f4b2b68023698301c2ee4283fa35ff293edbf9d73e6d5d2fb0f2c7b51dbf0266ebc0

data/githabit.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Morgan Kesler"]
   spec.email         = ["keslerm@dasbiersec.com"]
 
-  spec.summary       = "Automatically awards for tasks in HabitRPG based on github events." 
+  spec.summary       = "Automatically awards for tasks in HabitRPG based on github events."
   spec.description   = "Gamify your github work on GithabitRPG. This gem will automatically award those tasks for these events."
   spec.homepage      = "https://github.com/keslerm/githabit"
   spec.license       = "MIT"
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rest-client", "~> 1.8"
   spec.add_development_dependency "github_api", "~> 0.12.3"
+  spec.add_development_dependency "habitrpg_api", "~> 0.0.1"
 end

data/lib/githabit/app.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'pp'
 require 'githabit/github_api'
-require 'githabit/habitrpg_api'
+require 'habitrpg'
 require 'githabit/cache'
 
 module Githabit
@@ -15,7 +15,7 @@ module Githabit
 
       # Init apis
       @log.debug("Loading APIs")
-      @habit_api = HabitRPGAPI.new(@settings['habitrpg']['user'], @settings['habitrpg']['token'])
+      @habit_api = HabitRPG_API.new(@settings['habitrpg']['user'], @settings['habitrpg']['token'])
       @github_api = GithubAPI.new(@settings['github']['user'], @settings['github']['password'])
 
       # Initialize cache
@@ -72,42 +72,47 @@ module Githabit
       new_events_found = 0
 
       @log.info("Checking github for new events")
-      events = @github_api.get_user_events(@settings['github']['monitor_user'])
 
-      # For now only push events
-      events.select { |e| e['type'] == 'PushEvent'}.each do |event|
-        # We only want pushes to master branches
-        next if event['payload']['ref'] != "refs/heads/master"
+      begin
+        events = @github_api.get_user_events(@settings['github']['monitor_user'])
+        # For now only push events
+        events.select { |e| e['type'] == 'PushEvent'}.each do |event|
+          # We only want pushes to master branches
+          next if event['payload']['ref'] != "refs/heads/master"
 
-        # Find how many commits
-        event['payload']['commits'].each do |commit|
+          # Find how many commits
+          event['payload']['commits'].each do |commit|
 
-          # If already in the cache - skip it, we've already rewarded it
-          next if @cache.cached? ("Commit:#{commit['sha']}")
+            # If already in the cache - skip it, we've already rewarded it
+            next if @cache.cached? ("Commit:#{commit['sha']}")
 
-          @log.info("Rewarding commit: " + commit['sha'] + " to repo: " + event['repo']['name'] + " Message: " + commit['message'])
-          @habit_api.score_task(@github_commit_task_id, 'up', nil)
+            @log.info("Rewarding commit: " + commit['sha'] + " to repo: " + event['repo']['name'] + " Message: " + commit['message'])
+            @habit_api.score_task(@github_commit_task_id, 'up', nil)
 
-          new_events_found += 1
-        end
+            new_events_found += 1
+          end
 
-        @cache.cache(event)
+          @cache.cache(event)
 
-      end
+        end
 
-      events.select { |e| e['type'] == 'IssuesEvent'}.each do |event|
-        next if @cache.cached? ("Issue:#{event['id']}") or event['payload']['action'] != 'closed'
+        events.select { |e| e['type'] == 'IssuesEvent'}.each do |event|
+          next if @cache.cached? ("Issue:#{event['id']}") or event['payload']['action'] != 'closed'
 
-        @log.info("Rewarding closed issue for id: #{event['id']} Issue: #{event['payload']['issue']['title']}")
+          @log.info("Rewarding closed issue for id: #{event['id']} Issue: #{event['payload']['issue']['title']}")
 
-        @habit_api.score_task(@github_issue_task_id, 'up', nil)
-        new_events_found += 1
+          @habit_api.score_task(@github_issue_task_id, 'up', nil)
+          new_events_found += 1
 
-        @cache.cache(event)
+          @cache.cache(event)
 
-      end
+        end
 
-      @log.info("Found " + new_events_found.to_s + " new events this run")
+        @log.info("Found " + new_events_found.to_s + " new events this run")
+      end
+    rescue => e
+      @log.error("There was a problem communicating with the server")
+      @log.error(e)
     end
   end
 end

data/lib/githabit/version.rb

@@ -1,3 +1,3 @@
 module Githabit
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githabit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Morgan Kesler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.3
+- !ruby/object:Gem::Dependency
+  name: habitrpg_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: Gamify your github work on GithabitRPG. This gem will automatically award
   those tasks for these events.
 email:
@@ -93,7 +107,6 @@ files:
 - lib/githabit/app.rb
 - lib/githabit/cache.rb
 - lib/githabit/github_api.rb
-- lib/githabit/habitrpg_api.rb
 - lib/githabit/version.rb
 homepage: https://github.com/keslerm/githabit
 licenses:
@@ -115,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Automatically awards for tasks in HabitRPG based on github events.

data/lib/githabit/habitrpg_api.rb

@@ -1,48 +0,0 @@
-require 'json'
-require 'rest_client'
-require 'pp'
-
-class HabitRPGAPI
-
-  def initialize(api_user, api_token)
-    @api_user = api_user
-    @api_token = api_token
-  end
-
-  def score_task(task_id, direction, task)
-    post("user/tasks/#{task_id}/#{direction}", task)
-  end
-
-  def list_tasks()
-    get("user/tasks")
-  end
-
-  def get_task(task_id)
-    get("user/tasks/#{task_id}")
-  end
-
-  def create_task(task)
-    post("user/tasks", task)
-  end
-
-  private
-  def delete(url, params = nil)
-    JSON.parse(RestClient.delete("https://habitrpg.com/api/v2/#{url}", { 'x-api-key' => @api_token, 'x-api-user' => @api_user }))
-  end
-
-  private
-  def post(url, params = nil)
-    JSON.parse(RestClient.put("https://habitrpg.com/api/v2/#{url}", params, { 'x-api-key' => @api_token, 'x-api-user' => @api_user }))
-  end
-  
-  private
-  def post(url, params = nil)
-    JSON.parse(RestClient.post("https://habitrpg.com/api/v2/#{url}", params, { 'x-api-key' => @api_token, 'x-api-user' => @api_user }))
-  end
-
-  private
-  def get(url, params = nil)
-    JSON.parse(RestClient.get("https://habitrpg.com/api/v2/#{url}", { 'x-api-key' => @api_token, 'x-api-user' => @api_user }))
-  end
-end
-