social_snippet 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRjYWY3NTI5ZjRkN2I3ZmZmNTBmNzhkMDc4NDgxNjVmNWJmMDVmNQ==
+    ZjJkOWViMTBkNjE5NDJiMTEzN2I1MTkwMjRiOTkxMjY0NzdiYzY5ZQ==
   data.tar.gz: !binary |-
-    YTkyYTcwOGFhZmQ5ZmRhZTg5NjkyMjVjYmQwYWNjYmQ2OWJlMTI3Mg==
+    MWM0MGM0ZjYxOTc1OTI5MmU4MmI0MDkyM2RmZDU2MTMyM2FiOWU5Mw==
 SHA512:
   metadata.gz: !binary |-
-    MGU3M2Q2ZDBkZmIxZmMxMTIyNzhlMTNkMjNmNTgzM2ZhMDZlNzcxZTJhMTk4
-    ZTQwYzA3NGUxYmU0ZDg2MTBlZGRmZGRhN2VjNzg3MGNlNGQ4MjNkNzVlNWUy
-    MmRhNzNhMDY5ZDNlNDFlODExYTFlNDU4MjI0YzUzMzA4NTY1YWY=
+    Y2NlYmU0MDc0ZTQ0NWI4NTU2YjVlYzYzYzkwZWYyM2ZkMGQ0NTY3NmZkZTY2
+    MDdlZjgzZDg3NWM0YWZlZDVkOGM0YWU2YWI1YTc2MTYxZGIyZTNkY2MyNzhh
+    NjM5MDEzOWEzNWEwODAzMDJhZjIzYTdkY2M3NTZjMTc5Y2IwOGI=
   data.tar.gz: !binary |-
-    ODkzZWJlMzk0ODM4NTYwNzk5MjlkMDcxNDU2M2E2N2JkMmJjMWIzYWI5OGJi
-    MjA5ZDYwZTdkZmI5ZjY4ZGM5MmYwMDQ1NmRlMGY5N2ZhNWMzYjY2MmRiNWMz
-    YTQ0Y2Y5YjUxNDNkN2E3MmI4OGNkZGI2ZTU0NDk3OTRhMmY1ODU=
+    MTc5ODRjYWUzM2Y5NjJmOGY0NDRhYjZmNDRkYzA4ODg2OGYzN2M3MmI1N2Zh
+    ZmM3MGNhNmE0ZmVmYjE1ZjM4MTc2ZWRmOGQ0Y2RmODBkYTYwMjcwNDc2ZGU5
+    NDI2ZDlhYWIyZTg5OTRiNWZhY2VjYThhNTljZjdjZDBjMTdkNGY=

data/lib/social_snippet/repository/models/package.rb

@@ -38,6 +38,10 @@ module SocialSnippet::Repository::Models
       core.storage.write file_path, data
     end
 
+    def directory?(path)
+      core.storage.directory? real_path(normalize_path path)
+    end
+
     def add_dependency(new_name, new_ref)
       add_to_set :dependencies_array => {
         :name => new_name,

data/lib/social_snippet/repository/repository_manager.rb

@@ -71,22 +71,38 @@ module SocialSnippet::Repository
       end
     end
 
+    def all_repositories
+      Models::Repository.all.map {|repo| repo.name }
+    end
+
     def complete_repo_name(keyword)
       repo_name = get_repo_name_prefix(keyword)
-      find_repositories_start_with(repo_name)
+      if repo_name.empty?
+        all_repositories
+      else
+        find_repositories_start_with(repo_name)
+      end
+    end
+
+    def package_glob_path(package, path)
+      if package.snippet_json["main"].nil?
+        "#{path}*"
+      else
+        "#{package.snippet_json["main"]}/#{path}*"
+      end
     end
 
     def complete_file_name(keyword)
       repo_name = get_repo_name(keyword)
       package   = find_package(repo_name)
       file_path = keyword_filepath(keyword)
-      glob_path = "#{package.snippet_json["main"]}/#{file_path}*"
+      glob_path = package_glob_path(package, file_path)
 
-      package.glob(glob_path).map do |cand_file_path|
-        if core.storage.directory?(cand_file_path)
-          Pathname(cand_file_path).basename.to_s + "/"
+      package.glob(glob_path).map do |path|
+        if package.directory?(path)
+          ::Pathname.new(path).basename.to_s + "/"
         else
-          Pathname(cand_file_path).basename.to_s + ">"
+          ::Pathname.new(path).basename.to_s + ">"
         end
       end
     end
@@ -102,11 +118,11 @@ module SocialSnippet::Repository
     end
 
     def get_repo_name(keyword)
-      /^[^@]*@[^<]+<([^:#>]*[^:#>])/.match(keyword)[1]
+      /^[^@]*@[^<]+<([^:#>]*)/.match(keyword)[1]
     end
 
     def get_repo_name_prefix(keyword)
-      /^[^@]*@[^<]+<([^:#>]*[^:#>])$/.match(keyword)[1]
+      /^[^@]*@[^<]+<([^:#>]*)$/.match(keyword)[1]
     end
 
     def keyword_filepath(keyword)

data/lib/social_snippet/rspec/test_storage.rb

@@ -6,6 +6,63 @@ RSpec.configure do
 
       let(:storage) { ::SocialSnippet::Storage.new }
 
+      describe "#directory?" do
+
+        context "mkdir dir" do
+
+          before { storage.mkdir_p "dir" }
+
+          context "directory? dir" do
+            subject { storage.directory? "dir" }
+            it { should be_truthy }
+          end
+
+          context "directory? dir/" do
+            subject { storage.directory? "dir/" }
+            it { should be_truthy }
+          end
+
+          context "file? dir" do
+            subject { storage.file? "dir" }
+            it { should be_falsey }
+          end
+
+          context "file? dir/" do
+            subject { storage.file? "dir/" }
+            it { should be_falsey }
+          end
+
+          context "write dir/file.txt" do
+            before { storage.write "dir/file.txt", "" }
+            context "directory? dir" do
+              subject { storage.directory? "dir" }
+              it { should be_truthy }
+            end
+            context "directory? dir/" do
+              subject { storage.directory? "dir/" }
+              it { should be_truthy }
+            end
+            context "file? dir" do
+              subject { storage.file? "dir" }
+              it { should be_falsey }
+            end
+            context "file? dir/" do
+              subject { storage.file? "dir/" }
+              it { should be_falsey }
+            end
+            context "file? dir/file.txt" do
+              subject { storage.file? "dir/file.txt" }
+              it { should be_truthy }
+            end
+            context "directory? dir/file.txt" do
+              subject { storage.directory? "dir/file.txt" }
+              it { should be_falsey }
+            end
+          end
+        end
+
+      end #directory?
+
       describe "no entry" do
 
         context "read not_found.txt" do

data/lib/social_snippet/version.rb

@@ -1,6 +1,6 @@
 module SocialSnippet
 
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 
   module Version
 

data/social_snippet.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9.3"
 
   spec.add_runtime_dependency "version_sorter", "~> 2.0.0"
-  spec.add_runtime_dependency "rest-client", "~> 1.7.0"
+  spec.add_runtime_dependency "rest-client", "~> 1.8.0"
   spec.add_runtime_dependency "highline", "~> 1.7.0"
   spec.add_runtime_dependency "wisper", "~> 1.6.0"
   spec.add_runtime_dependency "social_snippet-supports-git", "~> 0.1.0"

data/spec/lib/api/completion_api_spec.rb

@@ -0,0 +1,128 @@
+require "spec_helper"
+
+describe ::SocialSnippet::Api::CompletionApi do
+
+  context "prepare repos" do
+
+    before do
+      # create normal repo
+      repo = ::SocialSnippet::Repository::Models::Repository.create(
+        :name => "repo-a",
+      )
+      repo.add_ref "1.2.3", "rev-1.2.3"
+      repo.add_package "1.2.3"
+
+      # create package
+      # src/
+      #   file/
+      #     sub_file_1.cpp
+      #     sub_file_2.cpp
+      #     sub_file_3.cpp
+      #   file.cpp
+      # snippet.json
+      package = ::SocialSnippet::Repository::Models::Package.create(
+        :repo_name => "repo-a",
+        :rev_hash => "rev-1.2.3",
+      )
+      package.add_directory "src"
+      package.add_directory "src/file"
+      package.add_file "snippet.json", {
+        :name => "repo-a",
+        :main => "src",
+      }.to_json
+      package.add_file "src/file.cpp", ""
+      package.add_file "src/file/sub_file_1.cpp", ""
+      package.add_file "src/file/sub_file_2.cpp", ""
+      package.add_file "src/file/sub_file_3.cpp", ""
+    end
+
+    before do
+      # create no-main repo
+      repo = ::SocialSnippet::Repository::Models::Repository.create(
+        :name => "repo-no-main",
+      )
+      repo.add_ref "0.0.0", "rev-0.0.0"
+      repo.add_package "0.0.0"
+
+      # create package
+      # file/
+      #   sub_file.cpp
+      # snippet.json
+      # file.cpp
+      package = ::SocialSnippet::Repository::Models::Package.create(
+        :repo_name => "repo-no-main",
+        :rev_hash => "rev-0.0.0",
+      )
+      package.add_directory "file"
+      package.add_file "snippet.json", {
+        :name => "repo-no-main",
+      }.to_json
+      package.add_file "file.cpp", ""
+      package.add_file "file/sub_file.cpp", ""
+    end
+
+    context "complete // @snip" do
+      subject do
+        lambda { fake_core.api.complete_snippet_path "//" }
+      end
+      it { should raise_error }
+    end
+
+    context "complete // @snip <" do
+      subject { fake_core.api.complete_snippet_path "// @snip <" }
+      it { should include "repo-a" }
+      it { should include "repo-no-main" }
+    end
+
+    context "complete // @snip<re" do
+      subject { fake_core.api.complete_snippet_path "// @snip <re" }
+      it { should include "repo-a" }
+      it { should include "repo-no-main" }
+    end
+
+    context "complete // @snip<repo-n" do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-n" }
+      it { should_not include "repo-a" }
+      it { should include "repo-no-main" }
+    end
+
+    context "complete // @snip<repo-a:" do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-a:" }
+      it { expect(subject.length).to eq 2 }
+      it { should include "file.cpp>" }
+      it { should include "file/" }
+    end
+
+    context "complete // @snip<repo-a:file" do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-a:file" }
+      it { expect(subject.length).to eq 2 }
+      it { should include "file.cpp>" }
+      it { should include "file/" }
+    end
+
+    context "complete // @snip<repo-a:file." do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-a:file." }
+      it { expect(subject.length).to eq 1 }
+      it { should include "file.cpp>" }
+    end
+
+    context "complete // @snip<repo-a:file/" do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-a:file/" }
+      it { expect(subject.length).to eq 3 }
+      it { should include "sub_file_1.cpp>" }
+      it { should include "sub_file_2.cpp>" }
+      it { should include "sub_file_3.cpp>" }
+    end
+
+    context "complete // @snip <repo-no-main:" do
+      subject { fake_core.api.complete_snippet_path "// @snip <repo-no-main:" }
+      it { expect(subject.length).to eq 3 }
+      it { should include "file.cpp>" }
+      it { should include "snippet.json>" }
+      it { should include "file/" }
+    end
+
+  end # prepare repos
+
+end # ::SocialSnippet::Api::CompletionApi
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_snippet
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Hiroyuki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version_sorter
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +297,7 @@ files:
 - spec/helpers/fakefs_helper.rb
 - spec/helpers/social_snippet_helper.rb
 - spec/helpers/webmock_helper.rb
+- spec/lib/api/completion_api_spec.rb
 - spec/lib/api/insert_snippet_spec.rb
 - spec/lib/api/update_repository_spec.rb
 - spec/lib/command_line/sspm_config_spec.rb
@@ -363,6 +364,7 @@ test_files:
 - spec/helpers/fakefs_helper.rb
 - spec/helpers/social_snippet_helper.rb
 - spec/helpers/webmock_helper.rb
+- spec/lib/api/completion_api_spec.rb
 - spec/lib/api/insert_snippet_spec.rb
 - spec/lib/api/update_repository_spec.rb
 - spec/lib/command_line/sspm_config_spec.rb