ghq-cache 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb9cbbbbff4e81ad27ebfe8843acde0445cb6cb
-  data.tar.gz: eff270b98efb58c0734e4378cc0a011e4d8572e9
+  metadata.gz: 029edda1d5f7d745b5e4716a54cac2da429fb476
+  data.tar.gz: 2d5a4ba671db6667b1704c7b72a4ce1306b7f67c
 SHA512:
-  metadata.gz: 83e3916598bc4235e6bfff056cb5d8a11d5179484cbc1cc9e7ebf8bde39d1124e349a1d99950f5ecac7a402798ea9532b639aed0f326e8b7208b95664be09db2
-  data.tar.gz: 3ba1c5d1baee346614c3e3a3944437350b58bba04cbe0787c31fcde27d273b374c2e02e9c0b3f90046f19e458bb0f1085a788ef481196cd86cc4a87da8149519
+  metadata.gz: 1cb1143dabf1600831a6ca22f07575b88044e7cccd76074f09c9da9bec9ba37095350cf856ac77bd2f1f151202c77c08f43a4cf759206c26907980fbf99d0108
+  data.tar.gz: 756f5a3794784ce4c690b051214c70729b429d4f11b881e686a6fe4d47a1f58553ac5465ff887601d7acd4ea7516a864f22c30dbde6cf6353c2aee5b4d393248

data/README.md

@@ -32,7 +32,7 @@ function ghq() {
       $GHQ $@
 
       # hook after ghq get
-      ghq-cache refresh &
+      (ghq-cache refresh &)
       ;;
     list )
       if [ ! -e ~/.ghq-cache ]; then
@@ -54,7 +54,7 @@ function peco-src() {
     full_dir="${GOPATH}/src/${selected_dir}"
 
     # Log repository access to ghq-cache
-    ghq-cache log $full_dir &
+    (ghq-cache log $full_dir &)
 
     BUFFER="cd ${full_dir}"
     zle accept-line

data/lib/ghq/cache/builder.rb

@@ -7,43 +7,46 @@ module Ghq
       class << self
         def build
           root = Logger.resume
+          obsolete_paths.each do |path|
+            root.remove_path(path)
+          end
           ghq_list.each do |path|
             root.register_path(File.join(root.name, path))
           end
 
-          cache = build_paths(root).join("\n").concat("\n")
+          dirs = flatten(root).sort_by do |dir|
+            sort_key(dir)
+          end.reverse
+          cache = dirs.map(&:full_path).join("\n").concat("\n")
           File.write(CACHE_PATH, cache)
         end
 
         private
 
-        def ghq_list
-          `#{GHQ_PATH} list`.split("\n")
+        def flatten(*dirs)
+          dirs.map do |dir|
+            next dir if dir.children.empty?
+            flatten(*dir.children)
+          end.flatten
         end
 
-        def build_paths(directory)
-          paths = []
-          sort_children(directory.children).each do |child|
-            if child.children.empty?
-              paths << File.join(directory.name, child.name)
-              next
-            end
+        def sort_key(dir)
+          return [dir.count] unless dir.parent
+          [dir.count, *sort_key(dir.parent)]
+        end
 
-            build_paths(child).each do |path|
-              if directory.root?
-                paths << path
-                next
-              end
-              paths << File.join(directory.name, path)
+        def obsolete_paths
+          cached_paths =
+            if File.exist?(CACHE_PATH)
+              File.read(CACHE_PATH).split("\n")
+            else
+              []
             end
-          end
-          paths
+          cached_paths - ghq_list
         end
 
-        def sort_children(children)
-          children.sort_by do |child|
-            [-1 * child.count, child.name]
-          end
+        def ghq_list
+          `#{GHQ_PATH} list`.split("\n")
         end
       end
     end

data/lib/ghq/cache/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'fileutils'
 
 module Ghq
   module Cache
@@ -13,6 +14,12 @@ module Ghq
         Logger.log(path)
         refresh
       end
+
+      desc 'purge', 'Delete ~/.ghq-cache and ~/.ghq-cache.log'
+      def purge
+        FileUtils.rm_f(Logger::LOG_PATH)
+        FileUtils.rm_f(Builder::CACHE_PATH)
+      end
     end
   end
 end

data/lib/ghq/cache/directory.rb

@@ -1,6 +1,6 @@
 module Ghq
   module Cache
-    class Directory < Struct.new(:name, :count, :children)
+    class Directory < Struct.new(:name, :count, :children, :parent)
       def initialize(*)
         super
         self.count ||= 0
@@ -28,10 +28,23 @@ module Ghq
         child.register_path(relative_path)
       end
 
+      def remove_path(path)
+        relative_path = path.gsub(%r[^#{name}/?], '')
+        return if relative_path.empty?
+
+        child = create_or_find(relative_path.split('/').first)
+        children.delete(child)
+      end
+
       def root?
         self.name.include?('/')
       end
 
+      def full_path
+        return name unless parent
+        File.join(parent.full_path, name)
+      end
+
       private
 
       def create_or_find(child_name)
@@ -42,6 +55,7 @@ module Ghq
 
         child = Directory.new(child_name)
         self.children << child
+        child.parent = self
         child
       end
     end

data/lib/ghq/cache/version.rb

@@ -1,5 +1,5 @@
 module Ghq
   module Cache
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghq-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor