social_snippet 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjU4NjgyZmM4MWYyZmRlOWZlNGQ1YmJmNzI0MzExOGI4MmQxODVjOA==
+    MGY3ZDIyZTVlYjU3MDA1ZTQxZjJkM2Q1MmVkMDdiNWQwMmMwYzcxOQ==
   data.tar.gz: !binary |-
-    NGJlMGFlOGYzMGViMDk0NzU3MjVkN2M3YmIyMDJiYjVmNWQzYTZkYQ==
+    NjBlY2E4ZGYyYzU2OTcwNTM4ZmNmMmZkMzU5ZDNiMTNhNDJiNTBkYQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2EyZGYwMDhjOTkyOTcyZWM0YzYxMDI2ZjE3YTM3M2NmZWE2N2NjMmE4Nzg2
-    MThjMjQ4Y2IxOGQ2NjNkNzM5MjMzMDdmYjAwZWJiNGQyMGM5Yjg0MGI1ZGQ2
-    OTM0Mjc3OThhOWJjMTAwZmE0N2I2OWNhZmFmMjkxOTJkYTcyN2I=
+    M2NmNjBkOWEyNjJlYWNmNzdiY2NmOGVhYzdiMGNjNTAyMzA2MDBjOGUwODEz
+    ODBkY2I0NjY5ZTIxNDQzZjZiNTk4OTdjMjI4NDI3ODY2MDcxMTM2MDc5OGMy
+    NjVmNDNkMGI0MGQ3NjAwMTZhMWVlMDA2MzlmMTcxNjk4ZTQwZTE=
   data.tar.gz: !binary |-
-    OTZmNzRhZTI4NmU4N2U1OThkYmNhYzdiNGJmMTA3MWQwZjU3Y2FmMGM4ZmU2
-    MDZlMGE2OWUwZmI0ODk1OWQ4NWZkNDdlN2VmMWFjNTk2Nzc1NmQxOGEwOWI3
-    MGI2NTg0MGJmY2Y5Y2M2YjE1YTUyOWY3MWM2ZmJmZWY3ZGRiMDU=
+    ZDkxZjIzMjQ3MWFjMGUzMjhkYmNlYmZjMTA4ZDQ5MTJiOTZhMWQ0MzQ4YTBm
+    NjRhZTBhOWVjYTA2YTUyNGFhNjc1Y2ZkYTYxYzVhMjg2YTNkMWU0OTZlMDYw
+    NmJjMWM0MmEzNzliMzE0ZjJmM2EyMWExOTY3ZmI2NmNhYTg4MGE=

data/lib/social_snippet/core.rb

@@ -25,7 +25,7 @@ class SocialSnippet::Core
     ::SocialSnippet::Repository::Models::Package.core = self
     ::SocialSnippet::Repository::Models::Repository.core = self
     @repo_manager = ::SocialSnippet::Repository::RepositoryManager.new(self)
-    @driver_factory = ::SocialSnippet::Repository::DriverFactory.new(self)
+    @driver_factory = ::SocialSnippet::Repository::DriverFactory # TODO
     @registry_client = ::SocialSnippet::Registry::RegistryClient.new(self)
     @api = ::SocialSnippet::Api.new(self)
   end

data/lib/social_snippet/repository/driver_factory.rb

@@ -1,13 +1,11 @@
-module SocialSnippet::Repository
+module SocialSnippet::Repository::DriverFactory
 
-  class DriverFactory
+  @@drivers = []
 
-    @@drivers = [Drivers::GitDriver]
+  class << self
 
-    attr_reader :core
-
-    def initialize(new_core)
-      @core = new_core
+    def drivers
+      @@drivers
     end
 
     def reset_drivers
@@ -15,7 +13,7 @@ module SocialSnippet::Repository
     end
 
     def add_driver(driver_class)
-      @@drivers.push driver_class
+      drivers.push driver_class
     end
 
     # @param url [String] The URL of repository
@@ -27,7 +25,7 @@ module SocialSnippet::Repository
     end
 
     def resolve_driver(url)
-      driver_class = @@drivers.select do |driver_class|
+      driver_class = drivers.select do |driver_class|
         driver_class.target? url
       end.first
       if driver_class.nil?
@@ -40,3 +38,4 @@ module SocialSnippet::Repository
   end # class << self
 
 end # DriverFactory
+

data/lib/social_snippet/repository/drivers/git_driver.rb

@@ -22,28 +22,23 @@ module SocialSnippet::Repository::Drivers
       rugged_repo.lookup(oid).read_raw.data
     end
 
-    def each_directory(ref)
-      rugged_ref(ref).target.tree.each do |c|
-        next unless c[:type] == :tree
-        yield ::SocialSnippet::Repository::Drivers::Entry.new(c[:name])
+    def each_directory(ref, &block)
+      rugged_ref(ref).target.tree.walk_trees do |parent, tree|
+        yield ::SocialSnippet::Repository::Drivers::Entry.new(join_path(parent, tree[:name]))
       end
     end
 
     def each_file(ref, &block)
-      walk_tree rugged_ref(ref).target.tree, ::Array.new, &block
+      rugged_ref(ref).target.tree.walk_blobs do |parent, item|
+        yield ::SocialSnippet::Repository::Drivers::Entry.new(join_path(parent, item[:name]), read_file(item[:oid]))
+      end
     end
 
-    def walk_tree(tree, parents)
-      tree.each_blob do |c|
-        path = ::File.join(*parents, c[:name])
-        yield ::SocialSnippet::Repository::Drivers::Entry.new(path, read_file(c[:oid]))
-      end
-      tree.each_tree do |t|
-        parents.push t[:name]
-        walk_tree(rugged_repo.lookup(t[:oid]), parents) do |content|
-          yield content
-        end
-        parents.pop
+    def join_path(a, b)
+      if a.empty?
+        b
+      else
+        ::File.join a, b
       end
     end
 
@@ -97,4 +92,6 @@ module SocialSnippet::Repository::Drivers
 
   end # GitDriver
 
+  ::SocialSnippet::Repository::DriverFactory.add_driver GitDriver
+
 end # SocialSnippet

data/lib/social_snippet/repository/drivers.rb

@@ -1,4 +1,3 @@
 module SocialSnippet::Repository::Drivers; end
 require_relative "drivers/driver_base"
-require_relative "drivers/git_driver"
 require_relative "drivers/entry"

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

@@ -8,7 +8,7 @@ module SocialSnippet::Repository::Models
     field :rev_hash, :type => String   # key
     field :name, :type => String
     field :paths, :type => Array, :default => ::Array.new
-    field :dependencies, :type => Hash, :default => ::Hash.new
+    field :dependencies_array, :type => Array, :default => ::Array.new
 
     def display_name
       name || "#{repo_name}@#{rev_hash}"
@@ -37,10 +37,19 @@ module SocialSnippet::Repository::Models
       core.storage.write file_path, data
     end
 
-    def add_dependency(name, ref)
-      modifier = {}
-      modifier[name] = ref
-      push :dependencies => modifier
+    def add_dependency(new_name, new_ref)
+      add_to_set :dependencies_array => {
+        :name => new_name,
+        :ref => new_ref,
+      }
+      @dependencies_cache = nil
+    end
+
+    def dependencies
+      @dependencies_cache ||= dependencies_array.inject(::Hash.new) do |dependencies, info|
+        dependencies[info[:name]] = info[:ref]
+        dependencies
+      end
     end
 
     def has_dependencies?

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

@@ -9,21 +9,39 @@ module SocialSnippet::Repository::Models
     field :current_ref, :type => String
     field :refs, :type => Array, :default => ::Array.new
     # rev_hash[ref] => Commit ID
-    field :rev_hash, :type => Hash, :default => ::Hash.new
+    field :rev_hash_array, :type => Array, :default => ::Array.new
     # package_refs[ref] => rev_hash
-    field :package_refs, :type => Hash, :default => ::Hash.new
+    field :package_refs_array, :type => Array, :default => ::Array.new
 
-    def add_package(ref)
-      modifier = ::Hash.new
-      modifier[ref] = rev_hash[ref]
-      push :package_refs => modifier
+    def rev_hash
+      @rev_hash_cache ||= rev_hash_array.inject(::Hash.new) do |rev_hash, info|
+        rev_hash[info[:ref]] = info[:rev_hash]
+        rev_hash
+      end
     end
 
-    def add_ref(ref, rev_hash)
-      add_to_set :refs => ref
-      modifier = ::Hash.new
-      modifier[ref] = rev_hash
-      push :rev_hash => modifier
+    def package_refs
+      @package_refs_cache ||= package_refs_array.inject(::Hash.new) do |package_refs, info|
+        package_refs[info[:ref]] = info[:rev_hash]
+        package_refs
+      end
+    end
+
+    def add_package(new_ref)
+      add_to_set :package_refs_array => {
+        :ref => new_ref,
+        :rev_hash => rev_hash[new_ref],
+      }
+      @package_refs_cache = nil
+    end
+
+    def add_ref(new_ref, new_rev_hash)
+      add_to_set :refs => new_ref
+      add_to_set :rev_hash_array => {
+        :ref => new_ref,
+        :rev_hash => new_rev_hash,
+      }
+      @rev_hash_cache = nil
     end
 
     def has_ref?(ref)

data/lib/social_snippet/repository/repository_manager.rb

@@ -16,7 +16,7 @@ module SocialSnippet::Repository
     # @param context [::SocialSnippet::Context] The context of snippet
     # @param tag [::SocialSnippet::Tag] The tag of snippet
     def get_snippet(context, tag)
-      ::SocialSnippet::Snippet.new(resolve_snippet_path(context, tag))
+      ::SocialSnippet::Snippet.new(core, resolve_snippet_path(context, tag))
     end
 
     # Resolve snippet path by context and tag

data/lib/social_snippet/repository.rb

@@ -1,6 +1,6 @@
 module SocialSnippet::Repository; end
-require_relative "repository/drivers"
 require_relative "repository/driver_factory"
+require_relative "repository/drivers"
 require_relative "repository/repository_manager"
 require_relative "repository/repository_errors"
 require_relative "repository/models"

data/lib/social_snippet/resolvers/insert_resolver.rb

@@ -26,7 +26,7 @@ module SocialSnippet
     def insert(text)
       raise "must be passed string" unless text.is_a?(String)
 
-      snippet = Snippet.new_text(text)
+      snippet = Snippet.new_text(core, text)
       snippet.snippet_tags.each do |tag_info|
         visit tag_info[:tag]
       end

data/lib/social_snippet/rspec/test_driver.rb

@@ -17,6 +17,15 @@ RSpec.configure do
 
           before { driver.fetch }
 
+          describe "#snippet_json" do
+
+            context "driver.snippet_json" do
+              subject { driver.snippet_json }
+              it { should include "name" => "example-repo" }
+            end
+
+          end
+
           describe "#each_file" do
             context "get files" do
               let(:files) { ::Hash.new }
@@ -25,17 +34,35 @@ RSpec.configure do
                   files[file.path] = file.data
                 end
               end
-              context "check files" do
-                subject { files }
-                it { should include "README.md" }
-                it { should include "snippet.json" }
-                it { should include "src/func.cpp" }
-                it { should include "src/func/sub_func_1.cpp" }
-                it { should include "src/func/sub_func_2.cpp" }
-                it { should include "src/func/sub_func_3.cpp" }
-                it { expect(files["snippet.json"]).to match "example-repo" }
-                it { expect(files["src/func/sub_func_1.cpp"]).to match "int sub_func_1()" }
+              subject { files }
+              it { should include "README.md" }
+              it { should include "snippet.json" }
+              it { should include "src/func.cpp" }
+              it { should include "src/func/sub_func_1.cpp" }
+              it { should include "src/func/sub_func_2.cpp" }
+              it { should include "src/func/sub_func_3.cpp" }
+              it { expect(files["snippet.json"]).to match "example-repo" }
+              it { expect(files["src/func/sub_func_1.cpp"]).to match "int sub_func_1()" }
+            end
+          end
+
+          describe "#each_directory" do
+            context "find directories" do
+              let(:directories) { ::Array.new }
+              before do
+                driver.each_directory("1.0.2") do |dir|
+                  directories.push dir.path
+                end
               end
+              subject { directories }
+              it { should include "src" }
+              it { should include "src/func" }
+              it { should_not include "README.md" }
+              it { should_not include "snippet.json" }
+              it { should_not include "src/func.cpp" }
+              it { should_not include "src/func/sub_func_1.cpp" }
+              it { should_not include "src/func/sub_func_2.cpp" }
+              it { should_not include "src/func/sub_func_3.cpp" }
             end
           end
 

data/lib/social_snippet/snippet.rb

@@ -2,19 +2,21 @@ module SocialSnippet
 
   class Snippet
 
+    attr_reader :core
     attr_reader :filepath
     attr_reader :code
     attr_reader :flag_no_tag
 
     # Constructor
-    def initialize(snippet_path)
+    def initialize(new_core, snippet_path)
+      @core = new_core
       @filepath = snippet_path
       read_file unless filepath.nil?
     end
 
     def read_file
       begin
-        @code = ::File.read(filepath).split($/)
+        @code = core.storage.read(filepath).split($/)
       rescue ::Errno::ENOENT => e
         @code = ["ERROR: #{e.to_s}"]
       end
@@ -44,9 +46,9 @@ module SocialSnippet
     class << self
 
       # Create instance by text
-      def new_text(s)
+      def new_text(new_core, s)
         raise "must be passed string" unless s.is_a?(String)
-        snippet = self.new(nil)
+        snippet = self.new(new_core, nil)
         snippet.read_text s
         snippet
       end

data/lib/social_snippet/version.rb

@@ -1,6 +1,6 @@
 module SocialSnippet
 
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 
   module Version
 

data/lib/social_snippet.rb

@@ -8,7 +8,6 @@ require "version_sorter"
 require "rest_client"
 require "optparse"
 require "uri"
-require "rugged"
 require "wisper"
 require "securerandom"
 
@@ -33,6 +32,9 @@ require_relative "social_snippet/storage"
 require_relative "social_snippet/document_backend"
 require_relative "social_snippet/document"
 
+# supports
+require "social_snippet/supports/git"
+
 # use file system as default storage backend
 SocialSnippet::StorageBackend::FileSystemStorage.activate!
 # use yaml as default document backend

data/social_snippet.gemspec

@@ -20,10 +20,10 @@ 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 "rugged", ["~> 0.21.4", ">= 0.21.4"]
   spec.add_runtime_dependency "rest-client", "~> 1.7.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"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/helpers/social_snippet_helper.rb

@@ -73,7 +73,7 @@ module SocialSnippet::SpecHelpers
   end
 
   def fake_driver_factory
-    @fake_driver_factory ||= ::SocialSnippet::Repository::DriverFactory.new(fake_core)
+    @fake_driver_factory ||= ::SocialSnippet::Repository::DriverFactory
   end
 
   def fake_registry_client

data/spec/lib/insert_resolver_spec.rb

@@ -22,7 +22,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
         pkg
       end
       allow(fake_core.repo_manager).to receive(:get_snippet) do |c, t|
-        ::SocialSnippet::Snippet.new_text(t.repo)
+        ::SocialSnippet::Snippet.new_text(fake_core, t.repo)
       end
     end
 
@@ -32,11 +32,11 @@ describe SocialSnippet::Resolvers::InsertResolver do
 
         before do
           allow(fake_core.repo_manager).to receive(:get_snippet) do |c, t|
-            ::SocialSnippet::Snippet.new_text([
+            ::SocialSnippet::Snippet.new_text(fake_core, [
               "def foo",
               "  42",
               "end",
-            ].join $/)
+            ].join($/))
           end
         end # prepare snippet
 

data/spec/lib/repository/{repository_factory_spec.rb → driver_factory_spec.rb}

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ::SocialSnippet::Repository::DriverFactory do
 
-  let(:driver_factory) { ::SocialSnippet::Repository::DriverFactory.new fake_core }
+  let(:driver_factory) { ::SocialSnippet::Repository::DriverFactory }
 
   class FakeGitDriver < ::SocialSnippet::Repository::Drivers::DriverBase
 

data/test/snippet_test.rb

@@ -29,7 +29,7 @@ module SocialSnippet
           ]
         end
 
-        let(:snippet) { Snippet.new nil }
+        let(:snippet) { Snippet.new fake_core, nil }
         before { snippet.read_text input.join($/) }
         subject { snippet.lines }
         it { should eq expected }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_snippet
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Hiroyuki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version_sorter
@@ -25,27 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.4
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.21.4
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.4
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.21.4
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -59,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: wisper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: social_snippet-supports-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -319,9 +313,8 @@ files:
 - spec/lib/inserter_spec.rb
 - spec/lib/registry_client_spec.rb
 - spec/lib/repository/driver_base_spec.rb
-- spec/lib/repository/git_driver_spec.rb
+- spec/lib/repository/driver_factory_spec.rb
 - spec/lib/repository/package_spec.rb
-- spec/lib/repository/repository_factory_spec.rb
 - spec/lib/repository/repository_manager_spec.rb
 - spec/lib/repository/repository_spec.rb
 - spec/lib/tag_parser_spec.rb
@@ -332,7 +325,6 @@ files:
 - test/config_test.rb
 - test/context_test.rb
 - test/driver_base_test.rb
-- test/git_driver_test.rb
 - test/insert_snippet_test.rb
 - test/install_command_test.rb
 - test/repository_manager_test.rb
@@ -387,9 +379,8 @@ test_files:
 - spec/lib/inserter_spec.rb
 - spec/lib/registry_client_spec.rb
 - spec/lib/repository/driver_base_spec.rb
-- spec/lib/repository/git_driver_spec.rb
+- spec/lib/repository/driver_factory_spec.rb
 - spec/lib/repository/package_spec.rb
-- spec/lib/repository/repository_factory_spec.rb
 - spec/lib/repository/repository_manager_spec.rb
 - spec/lib/repository/repository_spec.rb
 - spec/lib/tag_parser_spec.rb
@@ -400,7 +391,6 @@ test_files:
 - test/config_test.rb
 - test/context_test.rb
 - test/driver_base_test.rb
-- test/git_driver_test.rb
 - test/insert_snippet_test.rb
 - test/install_command_test.rb
 - test/repository_manager_test.rb

data/spec/lib/repository/git_driver_spec.rb

@@ -1,10 +0,0 @@
-require "spec_helper"
-
-describe ::SocialSnippet::Repository::Drivers::GitDriver do
-
-  let(:driver_class) { ::SocialSnippet::Repository::Drivers::GitDriver }
-
-  include_context :TestDriver
-
-end # GitDriver
-

data/test/git_driver_test.rb

@@ -1,51 +0,0 @@
-require "spec_helper"
-
-describe ::SocialSnippet::Repository::Drivers::GitDriver, :without_fakefs => true do
-
-  let(:driver) do
-    url = "git://github.com/social-snippet/example-repo"
-    ::SocialSnippet::Repository::Drivers::GitDriver.new url
-  end
-
-  context "fetch" do
-
-    before { driver.fetch }
-
-    context "has versions" do
-      subject { driver.has_versions? }
-      it { should be_truthy }
-    end # has versions
-
-    context "versions" do
-      subject { driver.versions }
-      it { should_not include "master" }
-      it { should include "1.0.0" }
-      it { should include "1.0.1" }
-      it { should include "1.0.2" }
-    end
-
-    context "tags" do
-      subject { driver.tags }
-      it { should_not include "master" }
-      it { should include "1.0.0" }
-      it { should include "1.0.1" }
-      it { should include "1.0.2" }
-    end
-
-    context "refs" do
-      subject { driver.refs }
-      it { should include "master" }
-      it { should include "1.0.0" }
-      it { should include "1.0.1" }
-      it { should include "1.0.2" }
-    end
-
-    context "snippet_json" do
-      subject { driver.snippet_json }
-      it { expect(driver.snippet_json["name"]).to eq "example-repo" }
-    end
-
-  end # fetch
-
-end # ::SocialSnippet::Repository::Drivers::GitDriver
-