social_snippet 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjJjNzJiN2EzNjk0Yzk3MjA0ODU3YWRiODIxYzE0NDYyNjZmODg3Nw==
+    ZjU4NjgyZmM4MWYyZmRlOWZlNGQ1YmJmNzI0MzExOGI4MmQxODVjOA==
   data.tar.gz: !binary |-
-    NjA2MGEwNzEzZjk3NjZkMGEzMTE4ZGU5MzM1OWIxMmJjNjY4MzU5Yg==
+    NGJlMGFlOGYzMGViMDk0NzU3MjVkN2M3YmIyMDJiYjVmNWQzYTZkYQ==
 SHA512:
   metadata.gz: !binary |-
-    YzVlYzRiZmQwM2MyZGM3ZWY5YjkxMjU4OGRlMmIzYjQyMmI0YmY1NzM3YTBl
-    OTBkYjBhMDliYTJjMzkyMjg2YWM0MjI3MDkzODA1MmY5M2Q1ZmRlNWZjYTdk
-    MTBjZTA1NDE4ZjljNGQ0ZTBkMDAwMWIxZjY3YjEwN2UzMDMyZmE=
+    Y2EyZGYwMDhjOTkyOTcyZWM0YzYxMDI2ZjE3YTM3M2NmZWE2N2NjMmE4Nzg2
+    MThjMjQ4Y2IxOGQ2NjNkNzM5MjMzMDdmYjAwZWJiNGQyMGM5Yjg0MGI1ZGQ2
+    OTM0Mjc3OThhOWJjMTAwZmE0N2I2OWNhZmFmMjkxOTJkYTcyN2I=
   data.tar.gz: !binary |-
-    MDQxZWI2MDMyOTA0ODhkNTBiN2FmMjUxZDBhNjdiYjI1NzJjMjcwYzE0YmMy
-    NWIzMTgwZDkzZjA5YTllZWNkZmMzY2Q4YzFmNDZhZTU0NWJhM2ViYjBkNDYw
-    NWUyZjRhYmUxZTg4OWQzZThhNWY4ZDk4N2VhNzI5Zjg4YTZlODU=
+    OTZmNzRhZTI4NmU4N2U1OThkYmNhYzdiNGJmMTA3MWQwZjU3Y2FmMGM4ZmU2
+    MDZlMGE2OWUwZmI0ODk1OWQ4NWZkNDdlN2VmMWFjNTk2Nzc1NmQxOGEwOWI3
+    MGI2NTg0MGJmY2Y5Y2M2YjE1YTUyOWY3MWM2ZmJmZWY3ZGRiMDU=

data/.travis.yml

@@ -10,17 +10,24 @@ bundler_args: "--without debug --jobs 3"
 
 sudo: false
 
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=YES
+
 script:
-  - bundle exec rake spec_all
-  - bundle exec rake spec_without_fakefs
-  - bundle exec rake test_without_fakefs
+  - bundle exec rake spec spec_all_without_fakefs
 
   # shell access test
   - bundle exec rake build
   - gem install pkg/social_snippet-*.gem
-  - sspm install example-repo
+  - export SOCIAL_SNIPPET_HOME=$HOME/.social-snippet-test
+  - export SOCIAL_SNIPPET_DEBUG=true
+  - sspm install example-repo#1.0.0
+  - echo "// @snip <example-repo:func.cpp>" | ssnip
   - sspm update
   - echo "// @snip <example-repo:func.cpp>" | ssnip
+  - unset SOCIAL_SNIPPET_HOME
+  - unset SOCIAL_SNIPPET_DEBUG
 
 deploy:
   provider: rubygems

data/README.md

@@ -1,11 +1,11 @@
 # Social Snippet
 
-[![Gem Version](https://img.shields.io/gem/v/social_snippet.svg?style=flat)](https://rubygems.org/gems/social_snippet)
-[![Build Status](https://img.shields.io/travis/social-snippet/social-snippet.svg?style=flat)](https://travis-ci.org/social-snippet/social-snippet)
-[![Code Climate](https://img.shields.io/codeclimate/github/social-snippet/social-snippet.svg?style=flat)](https://codeclimate.com/github/social-snippet/social-snippet)
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/social-snippet/social-snippet.svg?style=flat)](https://codeclimate.com/github/social-snippet/social-snippet)
-[![API Doc](http://img.shields.io/badge/RubyDocs-API-green.svg?style=flat)](http://www.rubydoc.info/github/social-snippet/social-snippet)
-[![Dependencies Status](https://img.shields.io/gemnasium/social-snippet/social-snippet.svg)](https://gemnasium.com/social-snippet/social-snippet)
+[![Gem Version](https://img.shields.io/gem/v/social_snippet.svg?style=flat-square)](https://rubygems.org/gems/social_snippet)
+[![Build Status](https://img.shields.io/travis/social-snippet/social-snippet.svg?style=flat-square)](https://travis-ci.org/social-snippet/social-snippet)
+[![Code Climate](https://img.shields.io/codeclimate/github/social-snippet/social-snippet.svg?style=flat-square)](https://codeclimate.com/github/social-snippet/social-snippet)
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/social-snippet/social-snippet.svg?style=flat-square)](https://codeclimate.com/github/social-snippet/social-snippet)
+[![API Doc](http://img.shields.io/badge/RubyDocs-API-green.svg?style=flat-square)](http://www.rubydoc.info/github/social-snippet/social-snippet)
+[![Dependencies Status](https://img.shields.io/gemnasium/social-snippet/social-snippet.svg?style=flat-square)](https://gemnasium.com/social-snippet/social-snippet)
 
 TODO: Write a gem description
 

data/Rakefile

@@ -12,6 +12,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec_all) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "false"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.pattern = [
     'spec/**/*_spec.rb',
     'test/**/*_test.rb',
@@ -22,8 +23,21 @@ RSpec::Core::RakeTask.new(:spec_all) do |t|
   ]
 end
 
+RSpec::Core::RakeTask.new(:spec_all_without_fakefs) do |t|
+  ENV["RSPEC_WITHOUT_FAKEFS"] = "true"
+  ENV["ENABLE_CODECLIMATE"] = "true"
+  t.pattern = [
+    'spec/**/*_spec.rb',
+    'test/**/*_test.rb',
+  ]
+  t.rspec_opts = [
+    "--color",
+  ]
+end
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "false"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--format documentation",
     "--color",
@@ -33,16 +47,17 @@ end
 
 RSpec::Core::RakeTask.new(:spec_current) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "false"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--format documentation",
     "--color",
-    "--tag ~without_fakefs",
     "--tag current",
   ]
 end
 
 RSpec::Core::RakeTask.new(:spec_without_fakefs) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "true"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--format documentation",
     "--color",
@@ -52,6 +67,7 @@ end
 
 RSpec::Core::RakeTask.new(:test) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "false"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--pattern '../test/*_test.rb'",
     "--color",
@@ -61,6 +77,7 @@ end
 
 RSpec::Core::RakeTask.new(:test_current) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "false"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--pattern '../test/*_test.rb'",
     "--color",
@@ -71,6 +88,7 @@ end
 
 RSpec::Core::RakeTask.new(:test_without_fakefs) do |t|
   ENV["RSPEC_WITHOUT_FAKEFS"] = "true"
+  ENV["ENABLE_CODECLIMATE"] = "false"
   t.rspec_opts = [
     "--pattern '../test/*_test.rb'",
     "--color",

data/lib/social_snippet.rb

@@ -10,6 +10,7 @@ require "optparse"
 require "uri"
 require "rugged"
 require "wisper"
+require "securerandom"
 
 module SocialSnippet; end
 require_relative "social_snippet/core"
@@ -27,3 +28,13 @@ require_relative "social_snippet/command_line"
 require_relative "social_snippet/logger"
 require_relative "social_snippet/api"
 require_relative "social_snippet/tsortable_hash"
+require_relative "social_snippet/storage_backend"
+require_relative "social_snippet/storage"
+require_relative "social_snippet/document_backend"
+require_relative "social_snippet/document"
+
+# use file system as default storage backend
+SocialSnippet::StorageBackend::FileSystemStorage.activate!
+# use yaml as default document backend
+SocialSnippet::DocumentBackend::YAMLDocument.activate!
+

data/lib/social_snippet/api/install_repository_api.rb

@@ -1,109 +1,50 @@
 module SocialSnippet::Api::InstallRepositoryApi
 
-  # Install repository (Core API)
-  #
-  # @param repo [::SocialSnippet::Repository::Drivers::BaseRepository]
-  def install_repository(repo_name, repo_ref, repo, options = {})
-    display_name = repo_name
-
-    if repo_ref.nil?
-      repo_ref = resolve_reference(repo)
-
-      if repo.has_versions?
-        output "Resolving #{display_name}'s version"
-      else
-        output "No versions, use current reference"
-      end
-    end
-
-    display_name = "#{repo_name}\##{repo_ref}"
-
-    output "Installing: #{display_name}"
-    unless options[:dry_run]
-      core.repo_manager.install repo_name, repo_ref, repo, options
-    end
-
-    output "Success: #{display_name}"
-
-    # install dependencies
-    if has_dependencies?(repo)
-      output "Finding #{display_name}'s dependencies"
-      install_missing_dependencies repo.dependencies, options
-      output "Finish finding #{display_name}'s dependencies"
-    end
-  end
-
-  # $ sspm install name
-  def install_repository_by_name(repo_name, repo_ref, options = {})
-    installed_as = repo_name
-    installed_as = options[:name] unless options[:name].nil?
-
-    unless installed_as === repo_name
-      output "Installing as #{installed_as}"
-    end
-
-    if core.repo_manager.exists?(installed_as, repo_ref)
-      output "#{installed_as} is already installed"
-      return
-    end
-
-    output "Finding: #{repo_name}"
+  def resolve_name_by_registry(repo_name)
+    output "Finding #{repo_name}..."
     info = core.registry_client.repositories.find(repo_name)
-    output "Found at: #{info["url"]}"
-
-    output "Cloning repository..."
-    repo = ::SocialSnippet::Repository::RepositoryFactory.clone(info["url"])
-
-    install_repository installed_as, repo_ref, repo
-  end
-
-  # $ sspm install URL
-  def install_repository_by_url(repo_url, repo_ref, options = {})
-    output "Cloning repository..."
-    repo = ::SocialSnippet::Repository::RepositoryFactory.clone(repo_url)
-    install_repository_by_repo repo, repo_ref, options
+    output "Found at #{info["url"]}"
+    info["url"]
   end
 
-  # $ sspm install ./path/to/repo
-  def install_repository_by_path(repo_path, repo_ref, options = {})
-    output "Cloning repository..."
-    repo = ::SocialSnippet::Repository::RepositoryFactory.clone_local(repo_path)
-    install_repository_by_repo repo, repo_ref, options
-  end
-
-  def install_repository_by_repo(repo, repo_ref, options)
-    installed_as = repo.name
-    installed_as = options[:name] unless options[:name].nil?
-    output "Installing as #{installed_as}"
+  # Install repository
+  #
+  # @param url [String]
+  # @param ref [String]
+  def install_repository(url, ref, options = {})
+    output "Fetching #{url}..."
 
-    if core.repo_manager.exists?(installed_as)
-      output "#{installed_as} is already installed"
-      return
+    unless options[:dry_run]
+      package = core.repo_manager.install(url, ref, options)
     end
+    output "Success #{package.display_name}"
 
-    install_repository installed_as, repo_ref, repo
+    if package.has_dependencies?
+      output "Finding package dependencies..."
+      install_missing_dependencies package.dependencies, options
+      output "Finished finding package dependencies."
+    end
   end
 
   def install_missing_dependencies(repo_deps, options = {})
     repo_deps.each do |dep_repo_name, dep_repo_ref|
       unless core.repo_manager.exists?(dep_repo_name, dep_repo_ref)
-        install_repository_by_name dep_repo_name, dep_repo_ref, options
+        url = resolve_name_by_registry(dep_repo_name)
+        install_repository url, dep_repo_ref, options
       end
     end
   end
 
   private
 
-  def resolve_reference(repo)
+  def resolve_reference_by_repo(repo)
     if repo.has_versions?
+      output "Resolving #{display_name}'s version"
       repo.latest_version
     else
+      output "No versions, use current reference"
       repo.current_ref
     end
   end
 
-  def has_dependencies?(repo)
-    repo.dependencies && ( not repo.dependencies.empty? )
-  end
-
 end

data/lib/social_snippet/api/manifest_api.rb

@@ -5,7 +5,7 @@ module SocialSnippet::Api::ManifestApi
   def init_manifest(options = {})
     current_answers = load_manifest_file || {}
     answer = loop_manifest_questions(current_answers)
-    ::File.write "snippet.json", ::JSON.pretty_generate(answer)
+    core.storage.write "snippet.json", ::JSON.pretty_generate(answer)
     answer
   end
 
@@ -24,8 +24,8 @@ module SocialSnippet::Api::ManifestApi
 
   # load current configuration
   def load_manifest_file
-    if ::File.exists?("snippet.json")
-      ::JSON.parse(::File.read "snippet.json")
+    if core.storage.exists?("snippet.json")
+      ::JSON.parse(core.storage.read "snippet.json")
     else
       nil
     end

data/lib/social_snippet/api/update_repository_api.rb

@@ -2,53 +2,52 @@ module SocialSnippet::Api::UpdateRepositoryApi
 
   # Update a repository
   # $ sspm update repo-name
-  def update_repository(repo_name, options = {})
-    unless core.repo_manager.exists?(repo_name)
-      output "ERROR: #{repo_name} is not installed"
-      return
+  def update_repository(name, options = {})
+    unless core.repo_manager.exists?(name)
+      raise "ERROR: #{name} is not installed"
     end
 
-    output "Fetching update for #{repo_name}"
-    ret = core.repo_manager.fetch(repo_name, options)
+    output "Fetching update for #{name}"
+    repo = core.repo_manager.find_repository(name)
+    driver = core.driver_factory.clone(repo.url)
+    # reload repository
+    repo = core.repo_manager.update_repository(driver, repo.url)
 
-    repo = core.repo_manager.find_repository(repo_name)
-    display_name = repo_name
-
-    # nothing to update
-    if ret == 0 && core.repo_manager.exists?(repo_name, repo.latest_version)
+    unless update_repository_for_each_minor_version(driver, repo, options)
       output "Everything up-to-date"
-      return
     end
+  end
 
-    output "Updating #{repo_name}"
-    unless options[:dry_run]
-      version = repo.latest_version
-      if repo.has_versions? && repo.current_ref != version
-        output "Bumping version into #{version}"
-        display_name = "#{repo_name}\##{version}"
-        repo.checkout version
-        core.repo_manager.update repo_name, version, repo, options
-      end
-      core.repo_manager.cache_installing_repo repo
+  # Update all installed repositories
+  # $ sspm update
+  def update_all_repositories(options = {})
+    core.repo_manager.each_repo do |repo|
+      update_repository repo.name, options
     end
+  end
 
-    output "Success #{display_name}"
+  def update_repository_for_each_minor_version(driver, repo, options)
+    repo.package_minor_versions.any? do |minor_version|
+      latest_version = driver.latest_version(minor_version)
+      next false if core.repo_manager.exists?(repo.name, latest_version)
 
-    # update deps
-    if core.repo_manager.has_deps?(repo_name)
-      output "Updating #{display_name}'s dependencies"
-      deps = core.repo_manager.deps(repo_name)
-      install_missing_dependencies deps, options
-      output "Finish updating #{display_name}'s dependencies"
+      output "Updating #{repo.name}##{minor_version}.x"
+      package = create_new_version_package(driver, latest_version)
+      output "Success #{package.display_name}"
+
+      if package.has_dependencies?
+        output "Updating #{package.display_name}'s dependencies"
+        install_missing_dependencies package.dependencies, options
+        output "Finish updating #{package.display_name}'s dependencies"
+      end
+
+      true
     end
   end
 
-  # Update all installed repositories
-  # $ sspm update
-  def update_all_repositories(options = {})
-    core.repo_manager.each_installed_repo do |repo_name|
-      update_repository repo_name, options
-    end
+  def create_new_version_package(driver, new_version)
+    output "Bumping version into #{new_version}"
+    core.repo_manager.create_package driver, new_version
   end
 
 end

data/lib/social_snippet/command_line/sspm/sub_commands/install_command.rb

@@ -39,24 +39,24 @@ EOF
     def install_by_snippet_json
       snippet_json = ::JSON.parse(File.read("snippet.json"))
       snippet_json["dependencies"].each do |name, ref|
-        core.api.install_repository_by_name name, ref, options
+        url = core.api.resolve_name_by_registry(name)
+        core.api.install_repository url, ref, options
       end
     end
 
     def install_by_names
       while has_next_token?
         token_str = next_token
+        repo_info = parse_repo_token(token_str)
         if is_name?(token_str)
-          repo_info = parse_repo_token(token_str)
-          core.api.install_repository_by_name repo_info[:name], repo_info[:ref], options
+          url = core.api.resolve_name_by_registry(repo_info[:name])
+          core.api.install_repository url, repo_info[:ref], options
         elsif is_url?(token_str)
-          repo_info = parse_repo_token(token_str)
           repo_url  = repo_info[:name]
-          core.api.install_repository_by_url repo_url, repo_info[:ref], options
+          core.api.install_repository repo_url, repo_info[:ref], options
         elsif is_path?(token_str)
-          repo_info = parse_repo_token(token_str)
           repo_path = repo_info[:name]
-          core.api.install_repository_by_path repo_path, repo_info[:ref], options
+          core.api.install_repository repo_path, repo_info[:ref], options
         end
       end
     end

data/lib/social_snippet/config.rb

@@ -30,7 +30,7 @@ class SocialSnippet::Config
     resolve_home
 
     # env vars > args > config.json
-    init_directories
+    init_filesystem
     load_file
     load_options options
     load_environment_variables
@@ -72,12 +72,12 @@ class SocialSnippet::Config
 
   def save_file
     @fields ||= {}
-    ::File.write file_path, fields.to_json
+    core.storage.write file_path, fields.to_json
   end
 
   def load_file
     begin
-      @fields = ::JSON.parse(::File.read file_path)
+      @fields = ::JSON.parse(core.storage.read file_path)
     rescue ::JSON::ParserError
       raise "error on parsing #{file_path}"
     end
@@ -88,6 +88,16 @@ class SocialSnippet::Config
   # config helpers
   #
 
+  def document_path
+    ::File.join home, "documents.yml"
+  end
+  
+  def package_path(repo_name, rev_hash, path = nil)
+    path = "" if path.nil?
+    raise "ERROR" if rev_hash.nil?
+    ::File.join home, "packages", repo_name, rev_hash, path
+  end
+
   def file_path
     ::File.join home, "config.json"
   end
@@ -112,11 +122,11 @@ class SocialSnippet::Config
     get :debug
   end
 
-  def init_directories
-    ::FileUtils.mkdir_p home
-    ::FileUtils.mkdir_p install_path
-    ::FileUtils.mkdir_p repository_cache_path
-    ::File.write file_path, {}.to_json unless ::File.exists?(file_path)
+  def init_filesystem
+    core.storage.mkdir_p home
+    core.storage.mkdir_p install_path
+    core.storage.mkdir_p repository_cache_path
+    core.storage.write file_path, {}.to_json unless core.storage.exists?(file_path)
   end
 
   private