tfs_graph 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305a88a142479775b0507af876a4e432b5069c62
-  data.tar.gz: 82b14fc50dd7d1b0fbb76bde73d861c4e6e6fef2
+  metadata.gz: 3024420a800c31fc3676483f1bbd658dda5c22d0
+  data.tar.gz: 527426b7e59e38f884db6876c264d655b11836a0
 SHA512:
-  metadata.gz: 383e2e25094ffc75ef1ec0a8b42fb2c8d3cc5c34198a6149ed9a633d2249f0bfdac5ae36040d70690fbe677afe2d95a8ef3950093b32c6b5b0cf4fa249bf8c65
-  data.tar.gz: 08b56fcb8b084152b282362434a4e692e19e967b5f626e767426b0cf1296d9b93431ba0fc496f1b02b9e7c55988cb6b23e67cf44360a5f160d4dd46ea875d953
+  metadata.gz: 43141894fdff22dd10f8a25864af7cf41875dc611320c7671cfc91a2d60c02ae4a0e2e4a11a7f13044e3f3aee5c713e6be32d1b44c71b8a8099407512380e47e
+  data.tar.gz: a70fad3373c4ac4bddd91e0cfe722abe255f73f90dd6eaf75e150d5cb09e08cc80a69a5fc3c92cc9e35c3f006bf92d29a9e6174219e6505e838d926450ca1455

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.0

data/Gemfile

@@ -3,17 +3,25 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in tfs_graph.gemspec
 gemspec
 
-gem "related", git: "https://github.com/plukevdh/related.git", branch: "preserve_external_ids"
-
 group :test do
   gem 'rspec'
   gem 'rspec-given'
+  gem 'flexmock'
   gem 'webmock'
   gem 'vcr'
-  gem 'factory_girl'
 end
 
 group :test, :development do
   gem "pry"
   gem 'benchmark-ips'
-end
+  gem "related", git: "https://github.com/plukevdh/related.git", branch: "namespace_fix"
+  gem 'timecop'
+
+  gem 'neo4j-core', git: "https://github.com/plukevdh/neo4j-core.git"
+
+  platforms :jruby do
+    gem 'neo4j-community'
+  end
+end
+
+gem 'simplecov', :require => false, :group => :test

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+require 'neo4j/tasks/neo4j_server'

data/lib/tfs_graph.rb

@@ -1,7 +1,6 @@
-require "related"
-
 require "tfs_graph/version"
 require "tfs_graph/config"
+require 'tfs_graph/repository_registry'
 require 'tfs_graph/graph_populator'
 
 module TFSGraph

data/lib/tfs_graph/abstract_store.rb

@@ -0,0 +1,23 @@
+require 'tfs_graph/tfs_client'
+require 'tfs_graph/tfs_helpers'
+require 'tfs_graph/store_helpers'
+
+module TFSGraph
+  class AbstractStore
+    include TFSClient
+    include TFSHelpers
+    include StoreHelpers
+
+    def fetch_and_cache
+      cache_all fetch_all
+    end
+
+    def fetch_all
+      normalize root_query.run
+    end
+
+    def cache_all(attr_set)
+      attr_set.map {|attrs| cache(attrs) }
+    end
+  end
+end

data/lib/tfs_graph/associators/branch_associator.rb

@@ -18,7 +18,7 @@ module TFSGraph
         return if root.nil?
 
         change.parent = root.id
-        change.save
+        change.save!
       end
     end
   end

data/lib/tfs_graph/associators/changeset_tree_builder.rb

@@ -0,0 +1,29 @@
+module TFSGraph
+  class ChangesetTreeBuilder
+    class << self
+      def to_tree(branch, changesets)
+        changesets.map.with_index do |changeset, i|
+          parent = (i == 0) ? branch : changesets[i-1]
+
+          if parent.is_a? TFSGraph::Changeset
+            changeset.parent = parent.id
+            changeset.save!
+          end
+
+          parent.add_child changeset
+          changeset
+        end
+      end
+
+      def set_branch_merges(changesets)
+        changesets.each do |cs|
+          from = cs.merges.max
+          next unless from
+
+          cs.merge_parent = from.id
+          cs.save!
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors.rb

@@ -0,0 +1,9 @@
+module TFSGraph
+  class Behaviors
+  end
+end
+
+types = %w{project branch changeset}
+
+types.each {|type| require_relative "behaviors/related_repository/#{type}" }
+types.each {|type| require_relative "behaviors/neo4j_repository/#{type}" }

data/lib/tfs_graph/behaviors/neo4j_repository/branch.rb

@@ -0,0 +1,39 @@
+module TFSGraph
+  class Behaviors
+    class Neo4jRepository
+      module Branch
+        def find_in_project(project, path)
+          # project.branches.detect {|b| b.path == path }
+          rebuild Neo4j::Label.query(:branch, conditions: {path: path, project: project.name }).first
+        end
+
+        def find_by_path(path)
+          branch = Neo4j::Label.query(:branch, conditions: {path: path}).first
+          raise TFSGraph::Repository::NotFound, "No branch found for #{path}" if branch.nil?
+
+          rebuild branch
+        end
+
+        def absolute_root_for(branch)
+          root = branch
+          proj = project_for_branch branch
+
+          until(root.master?) do
+            root = proj.branches.detect {|b| b.path == root.root }
+          end
+
+          root
+        end
+
+        def project_for_branch(branch)
+          RepositoryRegistry.instance.project_repository.find_by_name branch.project
+        end
+
+        private
+        def fetch_existing_record(obj)
+          find_by_path(obj.path).db_object
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors/neo4j_repository/changeset.rb

@@ -0,0 +1,12 @@
+module TFSGraph
+  class Behaviors
+    class Neo4jRepository
+      module Changeset
+        private
+        def fetch_existing_record(obj)
+          find_native(obj.id)
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors/neo4j_repository/project.rb

@@ -0,0 +1,89 @@
+module TFSGraph
+  class Behaviors
+    class Neo4jRepository
+      module Project
+        ROOT_BRANCH_QUERY = "MATCH (p:project {name: {project}})-[:branches]->(b:branch) WHERE (b.original_path = {path} OR b.root = {path})"
+        ACTIVITY_QUERY = "MATCH (a:project)-[:branches]->(b:branch)-[:changesets]->(c:changeset) where a.name = {name}"
+
+        def create(args)
+          obj = super
+          relate :projects, root, obj.db_object
+
+          obj
+        end
+
+        def all
+          get_nodes(root, :outgoing, :projects, TFSGraph::Project)
+        end
+
+        def active
+          projects = session.query "MATCH (p:project {hidden: 'false'}) RETURN p as `project`, ID(p) as `neo_id`"
+          rebuild_for_type self, projects, :project
+        end
+
+        def find_by_name(name)
+          project = Neo4j::Label.query(:project, conditions: {name: name}).first
+          raise TFSGraph::Repository::NotFound, "No project found for #{name}" if project.nil?
+
+          rebuild project
+        end
+
+        def root_branches(project)
+          roots = session.query "MATCH (p:project {name: {project}})-[:branches]->(b:branch {hidden: 'false', archived: 'false'}) where not has(b.root) RETURN b AS `branch`, ID(b) AS `neo_id`",
+            project: project.name
+
+          rebuild_for_type RepositoryRegistry.branch_repository, roots, :branch
+        end
+
+        def branches_for_root(project, branch)
+          branches = session.query "#{ROOT_BRANCH_QUERY} RETURN b as `branch`, ID(b) as `neo_id`",
+            project: project.name,
+            path: branch.path
+
+          rebuild_for_type RepositoryRegistry.branch_repository, branches, :branch
+        end
+
+        def active_branches_for_root(project, branch)
+          branches = session.query "#{ROOT_BRANCH_QUERY} AND b.archived = 'false' AND b.hidden = 'false' RETURN b as `branch`, ID(b) as `neo_id`",
+            project: project.name,
+            path: branch.path
+
+          rebuild_for_type RepositoryRegistry.branch_repository, branches, :branch
+        end
+
+        def changesets_for_root(project, branch)
+          changesets = session.query "#{ROOT_BRANCH_QUERY} MATCH b-[:changesets]->(c:changeset) RETURN c AS `changeset`, ID(b) as `neo_id` ORDER BY c.id",
+            project: project.name,
+            path: branch.path
+
+          rebuild_for_type RepositoryRegistry.changeset_repository, changesets, :changeset
+        end
+
+        def activity(project)
+          changesets = session.query "#{ACTIVITY_QUERY} RETURN c as `changeset`, ID(b) as `neo_id`",
+            name: project.name
+
+          rebuild_for_type RepositoryRegistry.changeset_repository, changesets, :changeset
+        end
+
+        def activity_by_date(project, time)
+          changesets = session.query "#{ACTIVITY_QUERY} AND c.created >= {time} RETURN c as `changeset`, ID(b) as `neo_id`",
+            { name: project.name, time: time.utc.to_i }
+
+          rebuild_for_type RepositoryRegistry.changeset_repository, changesets, :changeset
+        end
+
+        private
+        def rebuild_for_type(repo, data, key)
+          data.each_slice(2).map do |data,id|
+            repo.rebuild_from_query data[key]['data'], id[:neo_id]
+          end
+        end
+
+        def fetch_existing_record(obj)
+          find_by_name(obj.name).db_object
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors/related_repository/branch.rb

@@ -0,0 +1,26 @@
+module TFSGraph
+  class Behaviors
+    class RelatedRepository
+      module Branch
+        def find_in_project(project, path)
+          project.branches.detect {|b| b.path == path }
+        end
+
+        def absolute_root_for(branch)
+          root = branch
+          proj = project_for_branch branch
+
+          until(root.master?) do
+            root = proj.branches.detect {|b| b.path == root.root }
+          end
+
+          root
+        end
+
+        def project_for_branch(branch)
+          RepositoryRegistry.instance.project_repository.find_by_name branch.project
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors/related_repository/changeset.rb

@@ -0,0 +1,8 @@
+module TFSGraph
+  class Behaviors
+    class RelatedRepository
+      module Changeset
+      end
+    end
+  end
+end

data/lib/tfs_graph/behaviors/related_repository/project.rb

@@ -0,0 +1,48 @@
+module TFSGraph
+  class Behaviors
+    class RelatedRepository
+      module Project
+        def create(args)
+          obj = super
+          relate :projects, root, obj.db_object
+
+          obj
+        end
+
+        def all
+          get_nodes(root, :outgoing, :projects, TFSGraph::Project)
+        end
+
+        def active
+          all.reject &:hidden?
+        end
+
+        def find_by_name(name)
+          project = all.detect {|p| p.name == name }
+          raise TFSGraph::Repository::NotFound, "No project found for #{name}" if project.nil?
+
+          project
+        end
+
+        def branches_for_root(project, root)
+          project.branches.select {|b| b.root == branch.path || b.original_path == branch.path}
+        end
+
+        def changesets_for_root(project, root)
+          branches_for_root(project, root).map(&:changesets).flatten.sort
+        end
+
+        def activity(project)
+          project.branches.map {|b| b.changesets }.flatten
+        end
+
+        def activity_by_date(project, date)
+          activity = activity(project)
+          activity = activity.select {|c| c.created > date } unless date.nil?
+
+          activity
+        end
+      end
+    end
+  end
+end

data/lib/tfs_graph/branch.rb

@@ -1,10 +1,9 @@
-require 'tfs_graph/entity'
+require 'tfs_graph/persistable_entity'
 require 'tfs_graph/tfs_helpers'
 
 module TFSGraph
-  class Branch < Entity
+  class Branch < PersistableEntity
     extend TFSHelpers
-    extend Comparable
 
     SCHEMA = {
       original_path: {key: "Path", type: String},
@@ -12,10 +11,11 @@ module TFSGraph
       project: {converter: ->(path) { branch_project(path) }, key: "Path", type: String},
       name: {converter: ->(path) { branch_path_to_name(path) }, key: "Path", type: String},
       root: {converter: ->(path) { repath_archive(server_path_to_odata_path(path)) if path }, key: "ParentBranch", type: String},
-      created: {key: "DateCreated", type: DateTime},
+      created: {key: "DateCreated", type: Time},
       type: {default: "Feature", type: Integer},
       archived: {default: false, type: String},
-      hidden: {default: false, type: String}
+      hidden: {default: false, type: String},
+      last_updated: {type: Time, default: Time.at(0).utc}
     }
 
     BRANCH_TYPES = [
@@ -29,7 +29,12 @@ module TFSGraph
 
     act_as_entity
 
-    before_create :detect_type, :detect_archived
+    def initialize(repo, args)
+      super
+
+      detect_type
+      detect_archived
+    end
 
     BRANCH_TYPES.each do |t|
       define_method "#{t}?".to_sym do
@@ -37,6 +42,14 @@ module TFSGraph
       end
     end
 
+    def archived
+      @archived.to_s
+    end
+
+    def hidden
+      @hidden.to_s
+    end
+
     def archived?
       archived.to_s == "true"
     end
@@ -45,40 +58,40 @@ module TFSGraph
       hidden.to_s == "true"
     end
 
+    def active?
+      !hidden? && !archived?
+    end
+
     def named_type
       BRANCH_TYPES[type]
     end
 
+    def updated!
+      @last_updated = Time.now.utc
+      save!
+    end
+
+    def updated_since?(date)
+      @last_updated > date
+    end
+
     def hide!
       self.hidden = true
-      save
+      save!
     end
 
     def archive!
       self.archived = true
-      save
+      save!
     end
 
     def rootless?
       !master? && root.empty?
     end
 
-    def type_index(name)
-      BRANCH_TYPES.index(name.to_sym)
-    end
-
     # returns a branch
     def absolute_root
-      @absolute_root ||= begin
-        item = self
-        proj = ProjectStore.find_cached project
-
-        until(item.master?) do
-          item = proj.branches.detect {|branch| branch.path == item.root }
-        end
-
-        item
-      end
+      @absolute_root ||= @repo.absolute_root_for(self)
     end
 
     def branch?
@@ -87,11 +100,27 @@ module TFSGraph
 
     # branches this one touches or is touched
     def related_branches
-      incoming(:related).options(model: Branch).nodes.to_a.map &:id
+      @repo.get_nodes(db_object, :incoming, :related, Branch).map &:id
+    end
+
+    def merged_changesets
+      @repo.get_nodes(db_object, :outgoing, :included, Changeset)
+    end
+
+    def add_changeset(changeset)
+      # attach branch path
+      changeset.branch_path = self.path
+      changeset.save!
+
+      @repo.relate(:changesets, self.db_object, changeset.db_object)
+    end
+
+    def add_child(changeset)
+      @repo.relate(:child, self.db_object, changeset.db_object)
     end
 
     def changesets
-      outgoing(:changesets).options(model: Changeset).nodes.to_a
+      @repo.get_nodes(db_object, :outgoing, :changesets, Changeset)
     end
 
     def contributors
@@ -99,7 +128,7 @@ module TFSGraph
     end
 
     def root_changeset
-      @root ||= outgoing(:child).options(model: Changeset).nodes.to_a.first
+      @root = @repo.get_nodes(db_object, :outgoing, :child, Changeset).first if (@root.nil? || @root.empty?)
     end
 
     def last_changeset
@@ -108,20 +137,30 @@ module TFSGraph
 
     def ahead_of_master
       return 0 unless absolute_root
-      self.outgoing(:changesets)
-        .diff(absolute_root.outgoing(:included)
-          .intersect(self.outgoing(:changesets)))
-        .to_a.count
+      my_changes = changesets
+      root_changes = absolute_root.merged_changesets
+
+      # get intersection between root and this branch
+      intersect = root_changes & my_changes
+      # get difference of intersect with my changes
+      diff = my_changes - intersect
+
+      diff.count
     end
 
     # gets the set of changesets that exist in both root and self
     # then gets a diff of that set and the root.
     def behind_master
       return 0 unless absolute_root
-      absolute_root.outgoing(:changesets)
-        .diff(self.outgoing(:included)
-          .intersect(absolute_root.outgoing(:changesets)))
-        .to_a.count
+      my_changes = merged_changesets
+      root_changes = absolute_root.changesets
+
+      # get intersect between my changes and the root
+      intersect = my_changes & root_changes
+      # get diff of root changes to intersect
+      diff = root_changes - intersect
+
+      diff.count
     end
 
     def <=>(other)
@@ -129,20 +168,28 @@ module TFSGraph
     end
 
     def as_json(options={})
-      options.merge! methods: :related_branches
-      super
+      results = super
+      results[:related_branches] = related_branches
+      results[:id] = id
+
+      results
+    end
+
+    def type_index(name)
+      BRANCH_TYPES.index(name.to_sym)
     end
 
     private
+
     def detect_type
-      return self.type = type_index(:master) if (root.empty?)
+      return self.type = type_index(:master) if (root.nil? || root.empty?)
       return self.type = type_index(:release) if !(name =~ RELEASE_MATCHER).nil?
       self.type = type_index(:feature)
       nil
     end
 
     def detect_archived
-      self.archived = ARCHIVED_FLAGS.any? {|flag| original_path.include? flag }
+      self.archived = ARCHIVED_FLAGS.any? {|flag| original_path && original_path.include?(flag) }
       nil
     end