you_track 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889ce5a329ead3fe526595b6ccdedb2e9be2f54d
-  data.tar.gz: 6445d8f1eab01357762bb6a9213000316771a06d
+  metadata.gz: 2e542dac4f944908887f1a006dcc1d8de569fbf1
+  data.tar.gz: 75a5823009d83ff8bcdf82461c4cea7c6c057a9e
 SHA512:
-  metadata.gz: 1f9b2bc53461f95cf91059abbc490cebb36d0b0f0e78bee3a677b4928fa5affae7570ff74823c0885b520948124ca19647b8d694b6fbf0c2d95ba8d829d93e65
-  data.tar.gz: fa5f0df1b16a46c6a76968c2c3c201d3ee1c536b4c3a01b27ae69036044913c08fc783ef429b755e0fa946262321f7376a75a68fb891903241274df31c6444a4
+  metadata.gz: 41e1aaef65378c7e7994db4e34c2890dcea9a7607e093c5fa0516ce72f96cce4a87cf5caf2b787905d27b033ada25b6b18756c4f3119c8aa8f4d0a8957f4234c
+  data.tar.gz: 582abf84d61d51abfbfaf56de41041e7a68e4aadf87d740771097cfdfac8cfbe806ab18bd01d7c59ec345e7974c3b83295add502249cd7687e530c8d7166973f

data/lib/you_track/client/mock.rb

@@ -4,11 +4,110 @@ class YouTrack::Client::Mock
   def self.data
     @data ||= Hash.new { |h,k|
       h[k] = {
-        :issues   => {},
-        :comments => {},
-        :users    => {},
-        :projects => {},
+        :issues                => {},
+        :comments              => {},
+        :users                 => {},
+        :projects              => {},
+        :project_custom_fields => {},
+        :bundles => {
+          "States" => {
+            "type"   => "state",
+            "name"   => "States",
+            "values" => [
+              {"resolved" => "false", "value" => "Submitted"},
+              {"resolved" => "false", "value" => "Open"},
+              {"resolved" => "false", "value" => "In Progress"},
+              {"resolved" => "false", "value" => "To be discussed"},
+              {"resolved" => "false", "value" => "Reopened"},
+              {"resolved" => "true",  "value" => "Can't Reproduce"},
+              {"resolved" => "true",  "value" => "Duplicate"},
+              {"resolved" => "true",  "value" => "Fixed"},
+              {"resolved" => "true",  "value" => "Won't fix"},
+              {"resolved" => "true",  "value" => "Incomplete"},
+              {"resolved" => "true",  "value" => "Obsolete"},
+              {"resolved" => "true",  "value" => "Verified"},
+              {"resolved" => "false", "value" => "New"}
+            ]
+          }
+        },
         :custom_fields => {
+          "Type"              => {
+            "name"               => "Type",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "enum[1]",
+            "attachBundlePolicy" => 0,
+            "defaultBundle"      => "Types",
+          },
+          "Priority"          => {
+            "name"               => "Priority",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "enum[1]",
+            "attachBundlePolicy" => 0,
+            "defaultBundle"      => "Priorties",
+          },
+          "State"             => {
+            "name"               => "State",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "state[1]",
+            "attachBundlePolicy" => 0,
+            "defaultBundle"      => "States",
+          },
+          "Subsystem"         => {
+            "name"               => "Subsystem",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "ownedField[1]",
+            "attachBundlePolicy" => 1,
+            "defaultBundle"      => "Subsystems",
+          },
+          "Fixed in build"    => {
+            "name"               => "Fixed in build",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "build[1]",
+            "attachBundlePolicy" => 1,
+            "defaultBundle"      => "Builds",
+          },
+          "Assignee"          => {
+            "name"             => "Assignee",
+            "isPrivate"        => false,
+            "visibleByDefault" => true,
+            "autoAttached"     => true,
+            "type"             => "user[1]",
+          },
+          "Affected versions" => {
+            "name"               => "Affected versions",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "version[*]",
+            "attachBundlePolicy" => 1,
+            "defaultBundle"      => "Versions",
+          },
+          "Fix versions"      => {
+            "name"               => "Fix Versions",
+            "isPrivate"          => false,
+            "visibleByDefault"   => true,
+            "autoAttached"       => true,
+            "type"               => "version[*]",
+            "attachBundlePolicy" => 1,
+            "defaultBundle"      => "Versions",
+          },
+          "Due Date"          => {
+            "name"             => "Due Date",
+            "isPrivate"        => false,
+            "visibleByDefault" => true,
+            "autoAttached"     => true,
+            "type"             => "date",
+          },
         }
       }
     }

data/lib/you_track/client/models/issue.rb

@@ -5,12 +5,13 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
   attribute :comment_count, alias: "commentsCount", type: :integer
   attribute :comments, type: :array
   attribute :created_at, alias: "created", parser: ms_time
-  attribute :custom_fields, default: [], parser: lambda { |v, _| Hash[v] }
+  attribute :custom_fields, default: {}, parser: lambda { |v, _| Hash[v] }
   attribute :description
   attribute :project_id, alias: "projectShortName"
   attribute :project_index, alias: "numberInProject", type: :integer
   attribute :reporter, alias: "reporterFullName"
   attribute :reporter_username, alias: "reporterName"
+  attribute :resolved, parser: ms_time
   attribute :summary
   attribute :tags, alias: "tag", type: :array
   attribute :updated_at, alias: "updated", parser: ms_time
@@ -20,9 +21,6 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
 
   attr_accessor :permitted_group
 
-  # CREATE https://confluence.jetbrains.com/display/YTD6/Create+New+Issue
-  # UPDATE https://confluence.jetbrains.com/display/YTD6/Update+an+Issue
-
   def comments
     service.comments.load(service.get_issue_comments(self.identity).body)
   end
@@ -32,6 +30,24 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
     comments.detect { |c| c.text == comment }
   end
 
+  def assignee=(user)
+    user_id = user.is_a?(YouTrack::Client::User) ? user.identity : user
+    service.apply_issue_command("id" => self.identity, "command" => "Assignee #{user_id}")
+    self.reload
+  end
+
+  def assignee
+    if user_id = self.custom_fields["Assignee"]
+      service.users.new(
+        service.get_user(user_id).body
+      )
+    end
+  end
+
+  def resolved?
+    !! self.resolved
+  end
+
   def state
     custom_fields["State"]
   end

data/lib/you_track/client/request.rb

@@ -18,4 +18,8 @@ class YouTrack::Client::Request
     values = params.values_at(*requirements)
     values.size == 1 ? values.first : values
   end
+
+  def ms_time(time=Time.now)
+    time.to_i * 1000
+  end
 end

data/lib/you_track/client/requests/apply_issue_command.rb

@@ -1,36 +1,50 @@
 class YouTrack::Client::ApplyIssueCommand < YouTrack::Client::Request
-  def real(params={})
-    id = params.delete("id")
+  include YouTrack::Client::ParameterRequest
 
+  def identity
+    params.fetch("id")
+  end
+
+  def real
     service.request(
-      :path   => "/issue/#{id}/execute",
+      :path   => "/issue/#{identity}/execute",
       :query  => params,
       :method => :post,
     )
   end
 
-  def mock(params={})
-    id         = params.delete("id")
-    issue      = find(:issues, id)
+  def mock
+    issue      = find(:issues, identity)
     comment_id = "#{Cistern::Mock.random_numbers(2)}-#{Cistern::Mock.random_numbers(5)}"
 
-    if params["comment"]
-      comment = {
+    if comment = params["comment"]
+      service.data[:comments][comment_id] = {
         "id"             => comment_id,
         "author"         => service.username,
         "deleted"        => false,
-        "text"           => params["comment"],
+        "text"           => comment,
         "shownForIssuer" => false,
-        "created"        => Time.now.to_i * 1000,
-        "issueId"        => id,
+        "created"        => ms_time,
+        "issueId"        => identity,
       }
-      service.data[:comments][comment_id] = comment
     end
 
     if params["command"]
       commands = params["command"].split.each_slice(2).map { |a| [a[0], a[1]] }
-      commands.each do |command|
-        issue["custom_fields"].detect { |f| f[0] == command[0] }[1] = command[1]
+      commands.each do |field, value|
+        prototype = service.data[:custom_fields].fetch(field)
+
+        bundle_value = if bundle = service.data[:bundles][prototype["defaultBundle"]]
+                         bundle["values"].find { |v| v["value"] == value }
+                       else # @fixme explode
+                         {}
+                       end
+
+        if bundle_value["resolved"] == "true"
+          issue["resolved"] = ms_time(Time.now)
+        end
+
+        issue["custom_fields"].find { |name, _| name == field }[1] = value
       end
     end
 

data/lib/you_track/client/requests/create_issue.rb

@@ -1,3 +1,4 @@
+# https://confluence.jetbrains.com/display/YTD6/Create+New+Issue
 class YouTrack::Client::CreateIssue < YouTrack::Client::Request
   def real(params)
     service.request(
@@ -12,31 +13,44 @@ class YouTrack::Client::CreateIssue < YouTrack::Client::Request
 
     issue = Cistern::Hash.slice(params, "project", "description", "summary")
 
-    project = issue["projectShortName"] = issue.delete("project")
+    project_id = issue["projectShortName"] = issue.delete("project")
+    find(:projects, project_id)
 
     index = service.data[:issues].size + 1
-    project_index = service.data[:issues].values.select { |i| i["projectShortName"] == project }.size
+    project_index = service.data[:issues].values.select { |i| i["projectShortName"] == project_id }.size
 
-    identity = "#{project}-#{index}"
+    identity = "#{project_id}-#{index}"
 
     issue.merge!(
       "id"               => identity,
       "tag"              => "",
       "numberInProject"  => project_index,
-      "created"          => Time.now.to_i * 1000,
-      "updated"          => Time.now.to_i * 1000,
+      "created"          => ms_time(Time.now),
+      "updated"          => ms_time(Time.now),
       "updaterName"      => service.username,
       "updaterFullName"  => service.username.capitalize,
       "reporterName"     => service.username,
       "reporterFullName" => service.username.capitalize,
       "commentsCount"    => "0",
       "votes"            => "0",
-      "custom_fields"    => [
-        ["State", "Open"],
-      ], # @fixme need these
       "attachments"      => [],
+      "custom_fields"    => [],
     )
 
+    service.data[:project_custom_fields][project_id].each { |prototype|
+      default = if bundle = service.data[:bundles][prototype["defaultBundle"]]
+                  bundle["values"][prototype["attachBundlePolicy"].to_i]
+                else
+                  {}
+                end
+
+      if default["resolved"] == "true"
+        issue["resolved"] = ms_time(Time.now)
+      end
+
+      issue["custom_fields"] << [ prototype["name"], default["value"] ]
+    }
+
     service.data[:issues][identity] = issue
 
     service.response(

data/lib/you_track/client/requests/create_project.rb

@@ -31,10 +31,7 @@ class YouTrack::Client::CreateProject < YouTrack::Client::Request
       "versions"       => [],
     }.merge(Cistern::Hash.slice(params, "description"))
 
-    # @hack
-    service.data[:custom_fields][identity] = [
-      {"name" => "Fix versions", "url" => service.url_for("/admin/project/#{identity}/customfield/Fix versions")}
-    ]
+    service.data[:project_custom_fields][identity] = service.data[:custom_fields].values.select { |v| v["autoAttached"] }
 
     service.response(status: 201)
   end

data/lib/you_track/client/requests/get_project_custom_fields.rb

@@ -1,3 +1,4 @@
+# https://confluence.jetbrains.com/display/YTD6/GET+Project+Custom+Fields
 class YouTrack::Client::GetProjectCustomFields < YouTrack::Client::Request
   def real(id)
     service.request(
@@ -7,6 +8,17 @@ class YouTrack::Client::GetProjectCustomFields < YouTrack::Client::Request
   end
 
   def mock(id)
-    service.response(body: find(:custom_fields, id))
+    prototypes = find(:project_custom_fields, id)
+
+    body = prototypes.inject([]) { |r,p|
+      name = p.fetch("name")
+
+      r << {
+        "name" => name,
+        "url"  => service.url_for("/admin/project/#{id}/#{name}"),
+      }
+    }
+
+    service.response(body: body)
   end
 end

data/lib/you_track/client/requests/update_issue.rb

@@ -1,19 +1,33 @@
+# https://confluence.jetbrains.com/display/YTD6/Update+an+Issue
 class YouTrack::Client::UpdateIssue < YouTrack::Client::Request
-  def real(params={})
-    id = params.delete("id")
+  include YouTrack::Client::ParameterRequest
+
+  def self.accepted_attributes
+    # issueID # string  ID of an issue that should be updated.
+    @_accepted_attributes ||= [
+      "summary",     # string  New summary for the specified issue.
+      "description", # string  Updated description for the specified issue.
+    ]
+  end
+
+  def identity
+    params.fetch("id")
+  end
+
+  def accepted_attributes
+    Cistern::Hash.slice(params, *self.class.accepted_attributes)
+  end
+
+  def real
     service.request(
-      :path   => "/issue/#{id}",
+      :path   => "/issue/#{params.fetch("id")}",
       :method => :post,
-      :query  => params,
+      :query  => accepted_attributes,
     )
   end
 
-  def mock(params={})
-    id    = params.delete("id")
-    issue = find(:issues, id)
-
-    issue.merge!(params)
-    service.data[:issues][id] = issue
+  def mock
+    find(:issues, identity).merge!(accepted_attributes)
 
     service.response
   end

data/lib/you_track/parser.rb

@@ -7,9 +7,10 @@ parsers = %w(
   comments
   issue
   issues
+  project_custom_fields
   projects
+  state_bundle
   user
-  project_custom_fields
 )
 
 parsers.each do |parser|

data/lib/you_track/parser/base.rb

@@ -6,8 +6,6 @@ class YouTrack::Parser::Base
   end
 
   def parse_fields(fields)
-    fields.inject({}) { |r, f|
-      r.merge(f["name"] => f["value"])
-    }
+    fields.inject({}) { |r, f| r.merge(f["name"] => f["value"]) }
   end
 end

data/lib/you_track/parser/issue_parser.rb

@@ -6,6 +6,15 @@ class YouTrack::Parser::IssueParser < YouTrack::Parser::Base
     }
   end
 
+  def parse_user_fields(user_fields)
+    user_fields.inject({}) { |r, a|
+      outer_value = a["value"]
+      value = outer_value.delete("__content__")
+
+      r.merge(a["name"] => {"value" => value}.merge(outer_value))
+    }
+  end
+
   def parse
     results = raw["issue"].dup
 
@@ -16,9 +25,14 @@ class YouTrack::Parser::IssueParser < YouTrack::Parser::Base
     custom_fields = fields - attachments
 
     results.merge!(parse_fields(standard_fields))
-    results["custom_fields"] = parse_fields(custom_fields)
-    results["attachments"] = parse_attachments(attachments)
-    results["comments"] = results.delete("comment")
+
+    user_fields = custom_fields.select { |k| k["xsi:type"] == "MultiUserField" }
+
+    custom_fields -= user_fields
+
+    results["custom_fields"] = parse_fields(custom_fields).merge(parse_user_fields(user_fields))
+    results["attachments"]   = parse_attachments(attachments)
+    results["comments"]      = results.delete("comment")
 
     results
   end

data/lib/you_track/parser/state_bundle_parser.rb

@@ -0,0 +1,16 @@
+class YouTrack::Parser::StateBundleParser < YouTrack::Parser::Base
+  def parse
+    bundle = raw["stateBundle"]
+
+    states = bundle.delete("state")
+
+    bundle["states"] = states.inject([]) { |r,h|
+      r << {
+        "resolved" => h["isResolved"],
+        "value"    => h["__content__"],
+      }
+    }
+
+    bundle
+  end
+end

data/lib/you_track/version.rb

@@ -1,3 +1,3 @@
 module YouTrack
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: you_track
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Josh Lane
@@ -166,6 +166,7 @@ files:
 - lib/you_track/parser/issues_parser.rb
 - lib/you_track/parser/project_custom_fields_parser.rb
 - lib/you_track/parser/projects_parser.rb
+- lib/you_track/parser/state_bundle_parser.rb
 - lib/you_track/parser/user_parser.rb
 - lib/you_track/version.rb
 - you_track.gemspec