social_snippet 0.0.5 → 0.0.6

data/lib/social_snippet/api.rb

@@ -1,4 +1,14 @@
-require "json"
+class SocialSnippet::Api; end
+
+require_relative "api/config_api"
+require_relative "api/manifest_api"
+require_relative "api/insert_snippet_api"
+require_relative "api/install_repository_api"
+require_relative "api/update_repository_api"
+require_relative "api/completion_api"
+require_relative "api/show_api"
+require_relative "api/search_api"
+require_relative "api/registry_api"
 
 class SocialSnippet::Api
 
@@ -9,183 +19,15 @@ class SocialSnippet::Api
     @social_snippet = new_social_snippet
   end
 
-  # $ sspm config key=value
-  def config_set(key, value)
-    social_snippet.config.set! key, value
-  end
-
-  # $ sspm config key
-  def config_get(key)
-    value = social_snippet.config.get(key)
-    social_snippet.logger.say "#{key}=#{value}"
-  end
-
-  # Initialize the snippet.json interactively.
-  # $ sspm init
-  def init_manifest(options = {})
-    answer = {}
-    json_str = "{}"
-
-    # load current configuration
-    if ::File.exists?("snippet.json")
-      answer = ::JSON.parse(::File.read "snippet.json")
-    end
-
-    loop do
-      answer = ask_manifest_questions(manifest_questions(answer), answer)
-      json_str = ::JSON.pretty_generate(answer)
-      social_snippet.logger.say ""
-      social_snippet.logger.say json_str
-      social_snippet.logger.say ""
-      break if ask_confirm("Is this okay? [Y/N]: ")
-    end
-
-    ::File.write "snippet.json", json_str
-
-    answer
-  end
-
-  # Insert snippets to given text.
-  # $ ssnip
-  #
-  # @param src [String] The text of source code
-  #
-  def insert_snippet(src, options = {})
-    resolver = ::SocialSnippet::Resolvers::InsertResolver.new(social_snippet, options)
-    res = resolver.insert(src)
-    output res
-    res
-  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 social_snippet.repo_manager.exists?(installed_as, repo_ref)
-      output "#{installed_as} is already installed"
-      return
-    end
-
-    output "Finding: #{repo_name}"
-    info = social_snippet.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
-  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}"
-
-    if social_snippet.repo_manager.exists?(installed_as)
-      output "#{installed_as} is already installed"
-      return
-    end
-
-    install_repository installed_as, repo_ref, repo
-  end
-
-  # Update a repository
-  # $ sspm update repo-name
-  def update_repository(repo_name, options = {})
-    unless social_snippet.repo_manager.exists?(repo_name)
-      output "ERROR: #{repo_name} is not installed"
-      return
-    end
-
-    output "Fetching update for #{repo_name}"
-    ret = social_snippet.repo_manager.fetch(repo_name, options)
-
-    repo = social_snippet.repo_manager.find_repository(repo_name)
-    display_name = repo_name
-
-    # nothing to update
-    if ret == 0 && social_snippet.repo_manager.exists?(repo_name, repo.latest_version)
-      output "Everything up-to-date"
-      return
-    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
-        social_snippet.repo_manager.update repo_name, version, repo, options
-      end
-      social_snippet.repo_manager.cache_installing_repo repo
-    end
-
-    output "Success #{display_name}"
-
-    # update deps
-    if social_snippet.repo_manager.has_deps?(repo_name)
-      output "Updating #{display_name}'s dependencies"
-      deps = social_snippet.repo_manager.deps(repo_name)
-      install_missing_dependencies deps, options
-      output "Finish updating #{display_name}'s dependencies"
-    end
-  end
-
-  # Update all installed repositories
-  # $ sspm update
-  def update_all_repositories(options = {})
-    social_snippet.repo_manager.each_installed_repo do |repo_name|
-      update_repository repo_name, options
-    end
-  end
-
-  def complete_snippet_path(keyword)
-    social_snippet.repo_manager.complete(keyword)
-  end
-
-  def cli_complete_snippet_path(keyword)
-    complete_snippet_path(keyword).each do |cand_repo|
-      output cand_repo
-    end
-  end
-
-  def show_info(repo_name)
-    repo_info = social_snippet.registry_client.repositories.find(repo_name)
-    output ::JSON.pretty_generate(repo_info)
-  end
-
-  # $ sspm search query
-  def search_repositories(query, options = {})
-    format_text = search_result_format(options)
-    social_snippet.registry_client.repositories.search(query).each do |repo|
-      output format_text % search_result_list(repo, options)
-    end
-  end
-
-  def add_url(url, options = {})
-    ret = social_snippet.registry_client.repositories.add_url(url)
-    output ret
-  end
+  include ::SocialSnippet::Api::ConfigApi
+  include ::SocialSnippet::Api::ManifestApi
+  include ::SocialSnippet::Api::InsertSnippetApi
+  include ::SocialSnippet::Api::InstallRepositoryApi
+  include ::SocialSnippet::Api::UpdateRepositoryApi
+  include ::SocialSnippet::Api::CompletionApi
+  include ::SocialSnippet::Api::ShowApi
+  include ::SocialSnippet::Api::SearchApi
+  include ::SocialSnippet::Api::RegistryApi
 
   #
   # Helpers
@@ -193,137 +35,6 @@ class SocialSnippet::Api
 
   private
 
-  # Install repository
-  #
-  # @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]
-      social_snippet.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
-
-  def ask_confirm(message)
-    ret = social_snippet.prompt.ask(message) do |q|
-      q.limit = 1
-      q.validate = /^[yn]$/i
-    end
-    /y/i === ret
-  end
-
-  def ask_manifest_questions(questions, obj)
-    questions.inject(obj) do |obj, q|
-      obj[q[:key]] = ask_manifest_question(q)
-      obj
-    end
-  end
-
-  def ask_manifest_question(question)
-    if question[:type] === :string
-      social_snippet.prompt.ask("#{question[:key]}: ") do |q|
-        q.default = question[:default]
-        if question[:validate].is_a?(Regexp)
-          q.validate = question[:validate]
-        end
-      end
-    end
-  end
-
-  def manifest_questions(answer)
-    [
-      {
-        :key => "name",
-        :type => :string,
-        :validate => /[a-zA-Z0-9\.\-_]+/,
-        :default => answer["name"],
-      },
-      {
-        :key => "description",
-        :type => :string,
-        :default => answer["description"],
-      },
-      {
-        :key => "license",
-        :default => answer["license"] || "MIT",
-        :type => :string,
-      },
-    ]
-  end
-
-  def resolve_reference(repo)
-    if repo.has_versions?
-      repo.latest_version
-    else
-      repo.current_ref
-    end
-  end
-
-  def has_dependencies?(repo)
-    repo.dependencies && ( not repo.dependencies.empty? )
-  end
-
-  def install_missing_dependencies(repo_deps, options = {})
-    repo_deps.each do |dep_repo_name, dep_repo_ref|
-      unless social_snippet.repo_manager.exists?(dep_repo_name, dep_repo_ref)
-        install_repository_by_name dep_repo_name, dep_repo_ref, options
-      end
-    end
-  end
-
-  def search_result_format(options)
-    keys = [ # TODO: improve (change order by option, etc...)
-      :name,
-      :desc,
-      :url,
-      :installed,
-    ]
-
-    list = []
-    keys.each {|key| list.push "%s" if options[key] }
-
-    return list.join(" ")
-  end
-
-  def search_result_list(repo, options)
-    list = []
-    list.push repo["name"] if options[:name]
-    list.push "\"#{repo["desc"]}\"" if options[:desc]
-    list.push repo["url"] if options[:url]
-    list.push search_result_installed(repo) if options[:installed]
-    return list
-  end
-
-  def search_result_installed(repo)
-    if social_snippet.repo_manager.exists?(repo["name"])
-      "#installed"
-    else
-      ""
-    end
-  end
-
   def output(message)
     social_snippet.logger.say message
   end

data/lib/social_snippet/repository/repository_manager.rb

@@ -77,6 +77,8 @@ module SocialSnippet::Repository
     #
     # @param name [String] The name of repository
     def find_repository(name, ref = nil)
+      return nil if name.nil? || name.empty?
+
       repo_paths.each do |repo_path|
         path = "#{repo_path}/#{name}"
         if ::Dir.exists?(path)
@@ -86,7 +88,7 @@ module SocialSnippet::Repository
         end
       end
 
-      return nil
+      nil
     end
 
     def find_repositories_start_with(prefix)

data/lib/social_snippet/resolvers/base_resolver.rb

@@ -41,8 +41,29 @@ module SocialSnippet
       end
     end
 
+    # @param lines [Array<String>]
+    def filter(lines)
+      lines = cut_filter(lines)
+      lines
+    end
+
     private
 
+    def cut_filter(lines)
+      cut_level = 0
+      lines.select do |line|
+        if Tag.is_begin_cut?(line)
+          cut_level += 1
+          false
+        elsif Tag.is_end_cut?(line)
+          cut_level -= 1
+          false
+        else
+          cut_level === 0
+        end
+      end
+    end
+
     def move_context_by_tag!(context, tag)
       if tag.has_repo?
         if tag.has_ref?

data/lib/social_snippet/resolvers/dep_resolver.rb

@@ -48,8 +48,13 @@ module SocialSnippet
           :tag => tag,
           :context => new_context,
         })
-        # find more deps 
-        found_tags.push *find_func(snippet.lines.to_a, new_context, tag)
+        # find more deps
+        if snippet.is_a?(Snippet)
+          snippet_lines = snippet.lines
+        else
+          snippet_lines = snippet.split($/)
+        end
+        found_tags.push *find_func(snippet_lines, new_context, tag)
       end
 
       return found_tags

data/lib/social_snippet/resolvers/insert_resolver.rb

@@ -25,7 +25,7 @@ module SocialSnippet
     # @param src [Array<String>] The text of source code
     def insert(src)
       context = Context.new("")
-      lines = src.split($/)
+      lines = filter(src.split $/)
 
       TagParser.find_snippet_tags(lines).each do |tag_info|
         visit tag_info[:tag]
@@ -58,8 +58,12 @@ module SocialSnippet
     end
 
     # Insert snippet by tag and context
-    def insert_by_tag_and_context!(inserter, snippet, context, tag)
-      src = insert_func(snippet.lines.to_a, context, tag)
+    def insert_by_tag_and_context!(inserter, snippet_str, context, tag)
+      if snippet_str.is_a?(Snippet)
+        src = insert_func(snippet_str.lines, context, tag)
+      else
+        src = insert_func(snippet_str.split($/), context, tag)
+      end
 
       options[:margin_top].times { inserter.insert "" }
       inserter.insert tag.to_snippet_tag # @snip -> @snippet
@@ -71,7 +75,7 @@ module SocialSnippet
 
     # Insert depended snippet
     def insert_depended_snippets!(inserter, snippet, context, tag)
-      dep_tags = deps_resolver.find(snippet.lines.to_a, context, tag)
+      dep_tags = deps_resolver.find(snippet.lines, context, tag)
       dep_tags = sort_dep_tags_by_dep(dep_tags)
 
       dep_tags.each do |tag_info|

data/lib/social_snippet/tag.rb

@@ -93,6 +93,14 @@ class SocialSnippet::Tag
 
   class << self
 
+    def is_begin_cut?(s)
+      /@begin_cut/ === s
+    end
+
+    def is_end_cut?(s)
+      /@end_cut/ === s
+    end
+
     # Check given line to match @snip tag
     def is_snip_tag_line(s)
       return /@snip\s*<.*?>/ === s

data/lib/social_snippet/tag_parser.rb

@@ -7,22 +7,7 @@ class SocialSnippet::TagParser
     # @param s [String or Array] parsed text
     # @return [Array] found `@snip` tags with line_no
     def find_snip_tags(s)
-      found_lines = []
-
-      lines = get_lines(s)
-
-      lines.each.with_index do |line, i|
-        if ::SocialSnippet::Tag.is_snip_tag_line(line)
-          found_lines.push(
-            {
-              :line_no => i,
-              :tag => ::SocialSnippet::Tag.new(line),
-            }
-          )
-        end
-      end
-
-      return found_lines
+      find_lines(s) {|line| ::SocialSnippet::Tag.is_snip_tag_line(line) }
     end
 
     # Find `@snippet` tags from text
@@ -30,12 +15,14 @@ class SocialSnippet::TagParser
     # @param s [String or Array] parsed text
     # @return [Array] found `@snippet` tags with line_no
     def find_snippet_tags(s)
-      found_lines = []
+      find_lines(s) {|line| ::SocialSnippet::Tag.is_snippet_tag_line(line) }
+    end
 
-      lines = get_lines(s)
+    private
 
-      lines.each.with_index do |line, i|
-        if ::SocialSnippet::Tag.is_snippet_tag_line(line)
+    def find_lines(s, &comparator)
+      get_lines(s).each.with_index.inject([]) do |found_lines, (line, i)|
+        if comparator.call(line)
           found_lines.push(
             {
               :line_no => i,
@@ -43,9 +30,8 @@ class SocialSnippet::TagParser
             }
           )
         end
+        found_lines
       end
-
-      return found_lines
     end
 
     def get_lines(s)
@@ -53,6 +39,10 @@ class SocialSnippet::TagParser
         s.split($/)
       elsif s.is_a?(Array)
         s
+      elsif s.is_a?(Enumerator)
+        s
+      else
+        raise "error unknown data"
       end
     end
 

data/lib/social_snippet/version.rb

@@ -1,6 +1,6 @@
 module SocialSnippet
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   module Version
 

data/social_snippet.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 1.9.3"
+
   spec.add_runtime_dependency "version_sorter", "~> 1.1.0"
   spec.add_runtime_dependency "rugged", ["~> 0.21.4", ">= 0.21.4"]
   spec.add_runtime_dependency "rest-client", "~> 1.7.0"

data/spec/lib/command_line/sspm_init_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module SocialSnippet::CommandLine
 
-  describe SSpm::SubCommands::InitCommand, :current => true do
+  describe SSpm::SubCommands::InitCommand do
 
     describe "$ sspm init" do