clubhouse2 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40998417601b817ffb0e23d294fd1f5262e35d01
-  data.tar.gz: 0e111ccac222e17e6364e0aa0469a3c21f8c90d9
+  metadata.gz: dd670ee7b3ffc956dd48aa6c646e2dbe905b72c0
+  data.tar.gz: 6f795a61c79142106135e72cd978228d91fb1278
 SHA512:
-  metadata.gz: 34c1371201ef1e8bcec2fc2e8877d95b13436ef9916906ff161834f35e0835882f6670472ee9c251b8ca5dd3840d891543b17837dd927932040fd838186d2832
-  data.tar.gz: f6b0bdd08e9d6b18b1de74f6b5488f3d9064b15a02af6468b0d9579833227d226d326aadb92d6af91653455dc30d1efb764455e6544922e969f6d0883cee22a4
+  metadata.gz: 278a0f5d415e63413657dbe6518724ddcc2edc86061ebce1a0732b79875beecd15121f0a08eca41cbe89eb6d54552e815536d76b94e5d507ce8bb65dc688200a
+  data.tar.gz: 9862293188fff7c1b7b7001dd92ececcf94d025f6c4ad39707c907fd7a0a34c049d3d617530333e26ffe348e5c87a97c4639558b1b8d357a7aaabc3aaf2fc869

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.10

data/lib/clubhouse2.rb

@@ -18,6 +18,9 @@ require 'clubhouse2/team.rb'
 require 'clubhouse2/file.rb'
 require 'clubhouse2/task.rb'
 require 'clubhouse2/epic.rb'
+require 'clubhouse2/branch.rb'
+require 'clubhouse2/pull_request.rb'
+require 'clubhouse2/commit.rb'
 
 module Clubhouse
-end
+end

data/lib/clubhouse2/branch.rb

@@ -0,0 +1,7 @@
+module Clubhouse
+	class Branch < ClubhouseResource
+		def self.properties
+			[ :created_at, :deleted, :entity_type, :merged_branch_ids, :id, :name, :persistent, :pull_requests, :repository_id, :updated_at, :url ]
+		end
+	end
+end

data/lib/clubhouse2/client.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'json'
 
 module Clubhouse
-	class Client		
+	class Client
 		def initialize(api_key:, base_url: 'https://api.clubhouse.io/api/v2/')
 			@api_key = api_key
 			@base_url = base_url
@@ -52,7 +52,7 @@ module Clubhouse
 			new_params = args.compact.reject { |k, v| this_class.property_filter_create.include? k.to_sym }
 			response = api_request(:post, url(this_class.api_url), :json => new_params)
 			JSON.parse(response.to_s)
-		end		
+		end
 
 		def get_objects(resource_class, args = {})
 			this_class = Clubhouse::ClubhouseResource.subclass(resource_class)
@@ -97,7 +97,7 @@ module Clubhouse
 		def create_member(**args); create_object(:member, args); end
 		def members(**args); get_objects(:member, args); end
 		def member(**args); get_object(:member, args); end
-		
+
 		def create_team(**args); create_object(:team, args); end
 		def teams(**args); get_objects(:team, args); end
 		def team(**args); get_object(:team, args); end

data/lib/clubhouse2/clubhouse_resource.rb

@@ -58,7 +58,7 @@ module Clubhouse
 		end
 
 		def value_format(key, value)
-			Date.iso8601(value) rescue value
+			DateTime.strptime(value+'+0000', '%Y-%m-%dT%H:%M:%SZ%z') rescue value
 		end
 
 		# Empties resource cache
@@ -82,4 +82,4 @@ module Clubhouse
 			Hash[ (self.class.properties - self.class.property_filter_create).map { |name| [ name, instance_variable_get('@' + name.to_s) ] } ].compact
 		end
 	end
-end
+end

data/lib/clubhouse2/commit.rb

@@ -0,0 +1,7 @@
+module Clubhouse
+	class Commit < ClubhouseResource
+		def self.properties
+			[ :author_email, :author_id, :author_identity, :created_at, :entity_type, :hash, :id, :merged_branch_ids, :message, :repository_id, :timestamp, :updated_at, :url ]
+		end
+	end
+end

data/lib/clubhouse2/pull_request.rb

@@ -0,0 +1,7 @@
+module Clubhouse
+	class PullRequest < ClubhouseResource
+		def self.properties
+			[ :branch_id, :closed, :entity_type, :created_at, :id, :num_added, :num_commits, :num_modified, :num_removed, :number, :target_branch_id, :title, :updated_at, :url ]
+		end
+	end
+end

data/lib/clubhouse2/story.rb

@@ -2,7 +2,7 @@ module Clubhouse
 	class Story < ClubhouseResource
 		def self.properties
 			[
-				:archived, :blocker, :blocker, :comment_ids, :completed, :completed_at, :completed_at_override, :created_at,
+				:archived, :blocker, :blocked, :comment_ids, :completed, :completed_at, :completed_at_override, :created_at,
 				:deadline, :entity_type, :epic_id, :estimate, :external_id, :file_ids, :follower_ids, :id,
 				:linked_file_ids, :moved_at, :name, :owner_ids, :position, :project_id, :requested_by_id, :started,
 				:started_at, :started_at_override, :story_type, :task_ids, :updated_at, :workflow_state_id,
@@ -14,10 +14,10 @@ module Clubhouse
 		end
 
 		def validate(**args)
-			raise NoSuchEpic.new(args[:epic_id]) unless @client.epic(id: args[:epic_id]) if args[:epic_id] 
-			raise NoSuchProject.new(args[:project_id]) unless @client.project(id: args[:project_id]) if args[:project_id] 
-			raise NoSuchMember.new(args[:requested_by_id]) unless @client.member(id: args[:requested_by_id]) if args[:requested_by_id] 
-		
+			raise NoSuchEpic.new(args[:epic_id]) unless @client.epic(id: args[:epic_id]) if args[:epic_id]
+			raise NoSuchProject.new(args[:project_id]) unless @client.project(id: args[:project_id]) if args[:project_id]
+			raise NoSuchMember.new(args[:requested_by_id]) unless @client.member(id: args[:requested_by_id]) if args[:requested_by_id]
+
 			(args[:follower_ids] || []).each do |this_member|
 				raise NoSuchMember.new(this_member) unless @client.member(id: this_member)
 			end
@@ -102,9 +102,33 @@ module Clubhouse
 				files: [ *files ].collect(&:to_h),
 				story_links: [ *story_links ].collect(&:to_h),
 				labels: [ *labels ].collect(&:to_h),
+				branches: [ *branches ].collect(&:to_h),
+				commits: [ *commits ].collect(&:to_h),
 			})
 		end
 
+		def full_story(**args)
+			@full_story ||= begin
+				JSON.parse(@client.api_request(:get, @client.url("#{Story.api_url}/#{id}")))
+			end
+		end
+
+		def commits(**args)
+			@commits ||= begin
+				full_story['commits'].collect do |commit_data|
+					Commit.new(client: @client, object: commit_data)
+				end
+			end
+		end
+
+		def branches(**args)
+			@branches ||= begin
+				full_story['branches'].collect do |branch_data|
+					Branch.new(client: @client, object: branch_data)
+				end
+			end
+		end
+
 		def create_comment(**args)
 			Task.validate(**args)
 			@comments = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clubhouse2
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - James Denness
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -64,9 +64,11 @@ files:
 - VERSION
 - clubhouse2.gemspec
 - lib/clubhouse2.rb
+- lib/clubhouse2/branch.rb
 - lib/clubhouse2/category.rb
 - lib/clubhouse2/client.rb
 - lib/clubhouse2/clubhouse_resource.rb
+- lib/clubhouse2/commit.rb
 - lib/clubhouse2/epic.rb
 - lib/clubhouse2/epic_comment.rb
 - lib/clubhouse2/exceptions.rb
@@ -77,6 +79,7 @@ files:
 - lib/clubhouse2/milestone.rb
 - lib/clubhouse2/profile.rb
 - lib/clubhouse2/project.rb
+- lib/clubhouse2/pull_request.rb
 - lib/clubhouse2/repository.rb
 - lib/clubhouse2/state.rb
 - lib/clubhouse2/story.rb