gitlab-elasticsearch-git 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124cbbe73d9be0107bf261ec04b544f5e424a491
-  data.tar.gz: 5fba4f6f0893ac7b0947865d48a519dd3e38edf3
+  metadata.gz: 0c0282fc661a63a7df2bacfd3e4da215d2c689d0
+  data.tar.gz: 0b3267f71ed82e71bdc3f25b58a594dd2f91aa6a
 SHA512:
-  metadata.gz: cfd5d246d4bd85f7f1aee7b30e0da5aa3a12abb5ff845d047c9158e3128af4464fa7cdf2d232df2907134154fd28b19e8f6cf3735f54e5d7f7efc33efbb12a4a
-  data.tar.gz: 73bd68f1e6035115f9992a715ecb15f46eddd145ee2a97a1a07d10e79d770cf4f1e63ed439f12a0df3178b8f0cef901746d9587cffb51b5ccf85e43c3a78d97d
+  metadata.gz: 9f0fe56d9a2bff37ffccc9f92de92f5494123fa2873f40f34876daca40340fc47f4f9143899bd6c28517da0c278476cd73215509237a3b2ccaebf87075819280
+  data.tar.gz: 6738e1e8628d01b6c1bee9e24632ef4f2914204d1287a9978b62595d12522d10933b4e7e9d00942e1ba3ac9fc6d01fe28e937756f2969683fd0e929dbd89115b

data/.gitignore

@@ -2,10 +2,7 @@
 *.rbc
 .bundle
 .config
-_yardoc
 coverage
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
-tmp
+support/**

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.0.10
+ - Fix gem so it will work without rails
+ - Rspec
+ - Fix: prevent failings for repositories with different file permissions
+ - Revert ObjectSpace.garbage_collect from original gem
+
 0.0.9
  - Resolve dependency hell
 

data/Gemfile

@@ -6,10 +6,8 @@ gemspec
 gem 'elasticsearch-model'
 gem 'elasticsearch-api'
 gem 'rugged'
-gem 'bundler'
 gem 'rake'
 gem 'pry'
 gem 'charlock_holmes', '~> 0.7.3'
 gem 'github-linguist', '~> 4.7.0'
-gem 'minitest'
-gem 'wrong'
+gem 'rspec'

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    gitlab-elasticsearch-git (0.0.6)
-      activemodel (~> 4.2.0)
-      activesupport (~> 4.2.0)
-      charlock_holmes (~> 0.7.3)
-      elasticsearch-api (> 0.4.0)
-      elasticsearch-model
-      github-linguist (~> 4.7.0)
+    gitlab-elasticsearch-git (0.0.9)
+      activemodel (~> 4.2)
+      activesupport (~> 4.2)
+      charlock_holmes (~> 0.7)
+      elasticsearch-api (~> 1.0)
+      elasticsearch-model (~> 0.1.8)
+      github-linguist (~> 4.7)
       rugged (~> 0.23.3)
 
 GEM
@@ -56,42 +56,43 @@ GEM
     minitest (5.8.3)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    predicated (0.2.6)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.5.0)
-    ruby2ruby (2.2.0)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.7.2)
-      sexp_processor (~> 4.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     rugged (0.23.3)
-    sexp_processor (4.6.0)
     slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    wrong (0.7.1)
-      diff-lcs (~> 1.2.5)
-      predicated (~> 0.2.6)
-      ruby2ruby (>= 2.0.1)
-      ruby_parser (>= 3.0.1)
-      sexp_processor (>= 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   charlock_holmes (~> 0.7.3)
   elasticsearch-api
   elasticsearch-model
   github-linguist (~> 4.7.0)
   gitlab-elasticsearch-git!
-  minitest
   pry
   rake
+  rspec
   rugged
-  wrong
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -15,23 +15,8 @@ Now indexing text-like documents mo nore 1 mb size
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'elasticsearch-git', '~> 0.0.5'
+gem 'gitlab-elasticsearch-git', require 'elasticsearch-git'
 
-# or
-
-gem 'elasticsearch-git', github: 'zzet/elasticsearch-git', ref: 'last_ref'
-```
-
-And then execute:
-
-``` bash
-$ bundle
-```
-
-Or install it yourself as:
-
-``` bash
-$ gem install elasticsearch-git
 ```
 
 ## Usage
@@ -44,7 +29,9 @@ class Repository
     project.id
   end
 
-  repository_for_indexing '/path/to/your/repo'
+  def path_to_repo
+    '/path/to/your/repo'
+  end
 end
 
 Repository.__elasticsearch__.create_index! force: true
@@ -332,10 +319,6 @@ Project.last.repository.as_indexed_json
     :message=>"first commit\n"}]}
 ```
 
-## TODO
-
-    * Add Exceptions handlers for indexing (Error connections and timeouts)
-
 ## Contributing
 
 1. Fork it ( http://github.com/zzet/elasticsearch-git/fork )

data/lib/elasticsearch/git/model.rb

@@ -15,10 +15,10 @@ module Elasticsearch
         env = if defined?(::Rails)
                 ::Rails.env.to_s
               else
-                "undefined"
+                nil
               end
 
-        index_name [self.name.downcase, 'index', env].join('-')
+        index_name [self.name.downcase, 'index', env].compact.join('-')
 
         settings \
           index: {

data/lib/elasticsearch/git/repository.rb

@@ -5,6 +5,7 @@ require 'elasticsearch/git/model'
 require 'elasticsearch/git/encoder_helper'
 require 'elasticsearch/git/lite_blob'
 require 'rugged'
+require 'open3'
 
 module Elasticsearch
   module Git
@@ -86,10 +87,16 @@ module Elasticsearch
 
             perform_bulk bulk_operations
           end
+
+          ObjectSpace.garbage_collect
         end
 
         def perform_bulk(bulk_operations)
-          client_for_indexing.bulk body: bulk_operations.compact
+          bulk_operations.compact!
+
+          return false if bulk_operations.empty?
+
+          client_for_indexing.bulk body: bulk_operations
         end
 
 
@@ -162,6 +169,8 @@ module Elasticsearch
 
               perform_bulk bulk_operations
             end
+
+            ObjectSpace.garbage_collect
           end
         end
 

data/lib/elasticsearch/git/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Git
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/spec/main_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe TestRepository do
+  before do
+    remove_index(TestRepository.index_name)
+  end
+
+  it "creates an index" do
+    expect(index_exist?(TestRepository.index_name)).to be_falsey
+
+    TestRepository.__elasticsearch__.create_index!
+
+    expect(index_exist?(TestRepository.index_name)).to be_truthy
+  end
+
+  it "indexes all blobs and searches" do
+    repo = TestRepository.new
+    repo.index_blobs
+
+    TestRepository.__elasticsearch__.refresh_index!
+
+    expect(repo.search('def', type: :blob)[:blobs][:total_count]).to eq(4)
+  end
+
+  it "indexes all commits and searches" do
+    repo = TestRepository.new
+    repo.index_commits
+
+    TestRepository.__elasticsearch__.refresh_index!
+    
+    expect(repo.search('test', type: :commit)[:commits][:total_count]).to eq(2)
+  end
+
+  it "searches through all types" do
+    repo = TestRepository.new
+    repo.index_commits
+    repo.index_blobs
+
+    TestRepository.__elasticsearch__.refresh_index!
+    
+    expect(repo.search('test')[:commits][:total_count]).to eq(2)
+    expect(repo.search('def')[:blobs][:total_count]).to eq(4)
+  end
+
+  it "it indexes specified commits" do
+    repo = TestRepository.new
+    repo.index_commits(
+      from_rev: '40f4a7a617393735a95a0bb67b08385bc1e7c66d',
+      to_rev: '732401c65e924df81435deb12891ef570167d2e2'
+    )
+
+    TestRepository.__elasticsearch__.refresh_index!
+    
+    expect(repo.search('empty', type: :commit)[:commits][:total_count]).to eq(1)
+  end
+
+  it "it indexes specified blobs" do
+    repo = TestRepository.new
+    repo.index_blobs(
+      from_rev: '40f4a7a617393735a95a0bb67b08385bc1e7c66d',
+      to_rev: '732401c65e924df81435deb12891ef570167d2e2'
+    )
+
+    TestRepository.__elasticsearch__.refresh_index!
+    
+    expect(repo.search('Permission is hereby granted', type: :blob)[:blobs][:total_count]).to eq(1)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+require 'pry'
+require 'elasticsearch/git'
+
+require_relative 'support/seed_helper'
+require_relative 'support/elastic_helper'
+require_relative 'support/test_repository'
+
+SUPPORT_PATH = File.join(File.expand_path(File.dirname(__FILE__)), '../support')
+TEST_REPO_PATH = File.join(SUPPORT_PATH, 'gitlab-elasticsearch-git-test.git')
+
+RSpec.configure do |config|
+  config.order = 'random'
+  config.include ElasticHelper
+  config.include SeedHelper
+  config.before(:all) { ensure_seeds }
+end

data/spec/support/elastic_helper.rb

@@ -0,0 +1,14 @@
+module ElasticHelper
+  def index_exist?(index_name)
+    out, err, status = Open3.capture3("curl -XGET '#{elastic_url}/#{index_name}/'")
+    !out.include?('index_not_found_exception')
+  end
+
+  def remove_index(index_name)
+    system("curl -XDELETE '#{elastic_url}/#{index_name}/' > /dev/null 2>&1")
+  end
+
+  def elastic_url
+    'http://localhost:9200/'
+  end
+end

data/spec/support/seed_helper.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+
+module SeedHelper
+  GITLAB_URL = "git@gitlab.com:gitlab-org/gitlab-elasticsearch-git-test.git"
+
+  def ensure_seeds
+    if File.exists?(SUPPORT_PATH)
+      FileUtils.rm_r(SUPPORT_PATH)
+    end
+
+    FileUtils.mkdir_p(SUPPORT_PATH)
+
+    create_test_bare_repo
+  end
+
+  def create_test_bare_repo
+    system(git_env, *%W(git clone --bare #{GITLAB_URL}), chdir: SUPPORT_PATH)
+  end
+
+  # Prevent developer git configurations from being persisted to test
+  # repositories
+  def git_env
+    {'GIT_TEMPLATE_DIR' => ''}
+  end
+end

data/spec/support/test_repository.rb

@@ -0,0 +1,11 @@
+class TestRepository
+  include Elasticsearch::Git::Repository
+
+  def repository_id
+    'test_1'
+  end
+
+  def path_to_repo
+    TEST_REPO_PATH
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-elasticsearch-git
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Andrey Kumanyaev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -119,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -132,11 +133,11 @@ files:
 - lib/elasticsearch/git/model.rb
 - lib/elasticsearch/git/repository.rb
 - lib/elasticsearch/git/version.rb
-- test/lib/repository_test.rb
-- test/support/repo_info.rb
-- test/support/repository.rb
-- test/support/seed_helper.rb
-- test/test_helper.rb
+- spec/main_spec.rb
+- spec/spec_helper.rb
+- spec/support/elastic_helper.rb
+- spec/support/seed_helper.rb
+- spec/support/test_repository.rb
 homepage: https://gitlab.com/gitlab-org/gitlab-elasticsearch-git
 licenses:
 - MIT
@@ -162,8 +163,8 @@ signing_key:
 specification_version: 4
 summary: Elasticsearch integrations for git repositories.
 test_files:
-- test/lib/repository_test.rb
-- test/support/repo_info.rb
-- test/support/repository.rb
-- test/support/seed_helper.rb
-- test/test_helper.rb
+- spec/main_spec.rb
+- spec/spec_helper.rb
+- spec/support/elastic_helper.rb
+- spec/support/seed_helper.rb
+- spec/support/test_repository.rb

data/test/lib/repository_test.rb

@@ -1,43 +0,0 @@
-require 'test_helper'
-
-
-class RepositoryTest < TestCase
-  def setup
-    @repository = Repository.new
-    @repository.repository_for_indexing(TEST_REPO_PATH)
-    Repository.__elasticsearch__.create_index! force: true
-  end
-
-  def test_index_commits
-    commit_count = @repository.index_commits
-    assert { commit_count == RepoInfo::COMMIT_COUNT }
-  end
-
-  def test_index_commits_after_first_push
-    commit_count = @repository.index_commits(
-        from_rev: "0000000000000000000000000000000000000000",
-        to_rev: @repository.repository_for_indexing.head.target.oid)
-
-    assert { commit_count == RepoInfo::COMMIT_COUNT }
-  end
-
-  #TODO write better assertions
-  def test_index_all_blobs_from_head
-    blob_count = @repository.index_blobs
-    Repository.__elasticsearch__.refresh_index!
-
-    result = @repository.search('def project_name_regex')
-    assert { result[:blobs][:total_count]  == 1 }
-  end
-
-  #TODO write better assertions
-  def test_index_blobs_after_first_push
-    commit_count = @repository.index_blobs(
-        from_rev: "0000000000000000000000000000000000000000",
-        to_rev: @repository.repository_for_indexing.head.target.oid)
-    Repository.__elasticsearch__.refresh_index!
-
-    result = @repository.search('def project_name_regex')
-    assert { result[:blobs][:total_count]  == 1 }
-  end
-end

data/test/support/repo_info.rb

@@ -1,3 +0,0 @@
-module RepoInfo
- COMMIT_COUNT = 13
-end

data/test/support/repository.rb

@@ -1,9 +0,0 @@
-class Repository
-  include Elasticsearch::Git::Repository
-
-  index_name 'elasticsearch-git-test'
-
-  def repository_id
-    1
-  end
-end

data/test/support/seed_helper.rb

@@ -1,6 +0,0 @@
-unless File.exists?(TEST_REPO_PATH)
-  puts 'Prepare seeds'
-  FileUtils.mkdir_p(SUPPORT_PATH)
-  system(*%W(git clone --bare https://gitlab.com/gitlab-org/gitlab-test.git), chdir: SUPPORT_PATH)
-  system(*%W(git checkout 5937ac0a7beb003549fc5fd26fc247adbce4a52e), chdir: SUPPORT_PATH)
-end

data/test/test_helper.rb

@@ -1,29 +0,0 @@
-require "rubygems"
-require 'bundler/setup'
-require 'pry'
-require 'elasticsearch/git'
-
-SUPPORT_PATH = File.join(File.expand_path(File.dirname(__FILE__)), '../support')
-TEST_REPO_PATH = File.join(SUPPORT_PATH, 'gitlab-test.git')
-
-require_relative 'support/seed_helper'
-require_relative 'support/repository'
-require_relative 'support/repo_info'
-
-Bundler.require
-
-require 'wrong/adapters/minitest'
-
-PROJECT_ROOT = File.join(Dir.pwd)
-
-Wrong.config.color
-
-Minitest.autorun
-
-class TestCase < Minitest::Test
-  include Wrong
-
-  def fixtures_path
-    @path ||= File.expand_path(File.join(__FILE__, "../fixtures"))
-  end
-end