prj 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d755efc6530adac2bdda8cde66a08fcf8ec3024
+  data.tar.gz: 93dd041d8360989d8478756a04775cba78e6d2f2
+SHA512:
+  metadata.gz: 5cbd2335708ecdee9c2345724bcdbdb0a331ff01ceb34337e5db3cbfbcfcedd35278b237c12eb56ea2160b0eeafb48bc5db4d59c1adecb19adbcf62673f16273
+  data.tar.gz: b6ddc26391eeb07e758334d4b0f072d1819139e90d13a7a0f3a88154d0f6af47f717a839434ec9d0617a2551e400c565266838594abcbe7de7afe59d9ee464e0

data/Rakefile

@@ -26,7 +26,7 @@ task :default => [:all_specs]
 
 require 'rake/extensiontask'
 Rake::ExtensionTask.new do |t|
-  t.name    = 'finder'
+  t.name    = 'fast_traverse'
   t.ext_dir = 'ext/prj'
   t.lib_dir = 'lib/prj'
 end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/ext/prj/extconf.rb

@@ -1,4 +1,4 @@
 require 'mkmf'
 
-dir_config('finder')
-create_makefile('finder')
+dir_config('fast_traverse')
+create_makefile('fast_traverse')

data/ext/prj/fast_traverse.c

@@ -0,0 +1,47 @@
+#include <ruby.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fts.h>
+
+void Init_fast_traverse();
+
+VALUE prj_fast_traverse_traverse_m(VALUE self, VALUE projects_root, VALUE search_nested_repositories);
+
+VALUE Prj, FastTraverse;
+
+void Init_fast_traverse() {
+    Prj = rb_define_module("Prj");
+    FastTraverse = rb_define_module_under(Prj, "FastTraverse");
+    rb_define_singleton_method(FastTraverse, "traverse", prj_fast_traverse_traverse_m, 2);
+}
+
+VALUE prj_fast_traverse_traverse_m(VALUE self, VALUE projects_root, VALUE search_nested_repositories) {
+    FTS *fs        = NULL;
+    FTSENT *child  = NULL;
+    FTSENT *parent = NULL;
+    VALUE parent_path, child_name;
+
+    char *paths[] = { StringValueCStr(projects_root), NULL };
+    fs = fts_open(paths, FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT, NULL);
+
+    if (fs == NULL) {
+        return Qnil;
+    }
+
+    while ((parent = fts_read(fs)) != NULL) {
+        child = fts_children(fs, 0);
+        while(child != NULL) {
+            parent_path = rb_str_new(parent->fts_path, parent->fts_pathlen);
+            child_name = rb_str_new(child->fts_name, child->fts_namelen);
+            if (child->fts_info == FTS_D && rb_block_given_p() && RTEST(rb_yield_values(2, parent_path, child_name))) {
+                fts_set(fs, (RTEST(search_nested_repositories) ? child : parent), FTS_SKIP);
+            }
+            child = child->fts_link;
+        }
+    }
+
+    fts_close(fs);
+    return Qnil;
+}
+

data/lib/prj/finder.rb

@@ -0,0 +1,34 @@
+require 'prj/fast_traverse'
+
+module Prj
+
+  class Finder
+    def initialize(projects_root, options = {})
+      @root = File.expand_path(projects_root)
+      @vcs_directories = Array(options[:vcs_directories])
+      @search_nested_repositories = !!options[:search_nested_repositories]
+      @result = []
+    end
+
+    def find_project_directories
+      return @result unless @result.empty?
+      FastTraverse.traverse(@root, @search_nested_repositories) do |parent_path, child_name|
+        next false unless vcs_directory?(child_name)
+        @result << normalize_path(parent_path)
+      end
+      @result
+    end
+
+    private
+
+    def vcs_directory?(directory_name)
+      @vcs_directories.include? directory_name
+    end
+
+    def normalize_path(path)
+      path.sub(@root, "").chomp("/")
+    end
+  end
+
+end
+

metadata

@@ -1,68 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: prj
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vladimir Yarotsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
-description: ! '    Prj is an utility to quickly go to project directory using fuzzy
-  matching
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+description: |2
+      Prj is an utility to quickly go to project directory using fuzzy matching
 email: vladimir.yarotksy@gmail.com
 executables:
 - prj
@@ -73,11 +64,12 @@ files:
 - bin/prj
 - lib/prj/app.rb
 - lib/prj/dir_with_score.rb
+- lib/prj/fast_traverse.bundle
 - lib/prj/filter.rb
-- lib/prj/finder.bundle
+- lib/prj/finder.rb
 - lib/prj.rb
 - ext/prj/extconf.rb
-- ext/prj/finder.c
+- ext/prj/fast_traverse.c
 - spec/acceptance/app_spec.rb
 - spec/lib/prj/filter_spec.rb
 - spec/lib/prj/finder_spec.rb
@@ -91,27 +83,25 @@ files:
 homepage: http://github.com/v-yarotsky/prj
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Fuzzy-matching project finder
 test_files: []
-has_rdoc: 

data/ext/prj/finder.c

@@ -1,127 +0,0 @@
-#include <ruby.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fts.h>
-
-void Init_finder();
-
-VALUE prj_finder_initialize_m(VALUE self, VALUE projectsRoot, VALUE options);
-VALUE expand_path(VALUE path);
-
-VALUE prj_finder_find_project_directories_m(VALUE self);
-VALUE prj_finder_traverse_projects_root(VALUE self, char *projectsRoot, int searchNestedRepositories, VALUE (*callback)(VALUE self, const FTS *fs, const FTSENT *parent, const FTSENT *child));
-VALUE prj_finder_collect_project(VALUE self, const FTS *fs, const FTSENT *parent, const FTSENT *child);
-char * prj_finder_normalize_path(char *path);
-VALUE prj_finder_is_vcs_dir(VALUE self, const char *dir);
-
-VALUE Prj, PrjFinder;
-
-void Init_finder() {
-  Prj = rb_define_module("Prj");
-  PrjFinder = rb_define_class_under(Prj, "Finder", rb_cObject);
-  rb_define_method(PrjFinder, "initialize", prj_finder_initialize_m, 2);
-  rb_define_method(PrjFinder, "find_project_directories", prj_finder_find_project_directories_m, 0);
-}
-
-VALUE prj_finder_initialize_m(VALUE self, VALUE projectsRoot, VALUE options) {
-  VALUE expandedProjectsRoot, vcsDirectories, searchNestedRepositories;
-  expandedProjectsRoot = expand_path(projectsRoot);
-
-  vcsDirectories = rb_hash_aref(options, ID2SYM(rb_intern("vcs_directories")));
-
-  if (!RTEST(vcsDirectories)) {
-    vcsDirectories = rb_ary_new();
-  }
-
-  searchNestedRepositories = rb_hash_aref(options, ID2SYM(rb_intern("search_nested_repositories")));
-
-  rb_iv_set(self, "@root", expandedProjectsRoot);
-  rb_iv_set(self, "@vcs_directories", rb_check_array_type(vcsDirectories));
-  rb_iv_set(self, "@search_nested_repositories", searchNestedRepositories);
-  rb_iv_set(self, "@project_directories", rb_ary_new());
-  return self;
-}
-
-VALUE expand_path(VALUE path) {
-  VALUE file;
-  file = rb_const_get(rb_cObject, rb_intern("File"));
-  return rb_funcall(file, rb_intern("expand_path"), 1, rb_check_string_type(path));
-}
-
-VALUE prj_finder_find_project_directories_m(VALUE self) {
-  VALUE result, root, searchNestedRepositories;
-
-  result       = rb_iv_get(self, "@project_directories");
-  root         = rb_iv_get(self, "@root");
-  searchNestedRepositories = rb_iv_get(self, "@search_nested_repositories");
-
-  if (RARRAY_LEN(result) == 0) {
-    prj_finder_traverse_projects_root(self, StringValueCStr(root), RTEST(searchNestedRepositories), &prj_finder_collect_project);
-  }
-
-  return result;
-}
-
-VALUE prj_finder_traverse_projects_root(VALUE self, char *projectsRoot, int searchNestedRepositories, VALUE (*callback)(VALUE self, const FTS *fs, const FTSENT *parent, const FTSENT *child)) {
-  FTS *fs        = NULL;
-  FTSENT *child  = NULL;
-  FTSENT *parent = NULL;
-
-  char *paths[] = { projectsRoot, NULL };
-  fs = fts_open(paths, FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT, NULL);
-
-  if (fs == NULL) {
-    return Qnil;
-  }
-
-  while ((parent = fts_read(fs)) != NULL) {
-    child = fts_children(fs, 0);
-    while (child != NULL) {
-      if (child->fts_info == FTS_D && RTEST(callback(self, fs, parent, child))) {
-        fts_set(fs, (searchNestedRepositories ? child : parent), FTS_SKIP);
-      }
-      child = child->fts_link;
-    }
-  }
-  fts_close(fs);
-
-  return Qnil;
-}
-
-VALUE prj_finder_collect_project(VALUE self, const FTS *fs, const FTSENT *parent, const FTSENT *child) {
-  VALUE root, result;
-  char *prefixed, *unprefixed;
-
-  if (!prj_finder_is_vcs_dir(self, child->fts_name)) {
-    return Qfalse;
-  }
-
-  root   = rb_iv_get(self, "@root");
-  result = rb_iv_get(self, "@project_directories");
-
-  prefixed   = parent->fts_path;
-  unprefixed = prefixed + RSTRING_LEN(root);
-
-  rb_ary_push(result, rb_str_new2(prj_finder_normalize_path(unprefixed)));
-  return Qtrue;
-}
-
-// strips unnecessary trailing / on linux
-char * prj_finder_normalize_path(char *path) {
-  size_t path_length;
-  path_length = strlen(path);
-
-  if (path[path_length - 1] == '/') {
-    path[path_length - 1] = '\0';
-  }
-
-  return path;
-}
-
-VALUE prj_finder_is_vcs_dir(VALUE self, const char *dir) {
-  VALUE vcsDirectories;
-  vcsDirectories = rb_iv_get(self, "@vcs_directories");
-  return rb_funcall(vcsDirectories, rb_intern("include?"), 1, rb_str_new2(dir));
-}
-