social_snippet 0.0.7 → 0.0.8

data/lib/social_snippet/tag.rb

@@ -1,5 +1,7 @@
 class SocialSnippet::Tag
 
+  require "pathname"
+
   attr_reader :path
   attr_reader :repo
   attr_reader :ref
@@ -11,15 +13,15 @@ class SocialSnippet::Tag
   #
   # @param s [String] tag line text
   def initialize(s)
-    @path   = SocialSnippet::Tag.get_path(s)
-    @repo   = SocialSnippet::Tag.get_repo(s)
-    @ref    = SocialSnippet::Tag.get_ref(s)
-    @prefix = SocialSnippet::Tag.get_prefix(s)
-    @suffix = SocialSnippet::Tag.get_suffix(s)
-    @spaces = SocialSnippet::Tag.get_spaces(s)
+    set_path self.class.get_path(s)
+    @repo   = self.class.get_repo(s)
+    @ref    = self.class.get_ref(s)
+    @prefix = self.class.get_prefix(s)
+    @suffix = self.class.get_suffix(s)
+    @spaces = self.class.get_spaces(s)
 
     # to normalize repo's path
-    set_path SocialSnippet::Tag.get_path(s)
+    set_path self.class.get_path(s)
   end
 
   # Set information by another tag
@@ -31,12 +33,19 @@ class SocialSnippet::Tag
     self
   end
 
+  def filename
+    ::Pathname.new(path).basename.to_s
+  end
+
   # Set path
   def set_path(new_path)
     @path = normalize_path(new_path)
   end
 
   def normalize_path(path)
+    # ././foo/bar => foo/bar
+    path.gsub! /^\.\//, "" while /^\.\// === path
+
     # repo:/path/to/file -> repo:path/to/file
     path[0] = "" if has_repo? && path[0] == "/"
 
@@ -93,6 +102,18 @@ class SocialSnippet::Tag
 
   class << self
 
+    def is_control_tag?(s)
+      is_no_tag_line?(s)
+    end
+
+    def is_no_tag_line?(s)
+      /@no_tag/ === s
+    end
+
+    def is_cut?(s)
+      /@cut/ === s
+    end
+
     def is_begin_cut?(s)
       /@begin_cut/ === s
     end

data/lib/social_snippet/tag_parser.rb

@@ -1,51 +1,60 @@
-class SocialSnippet::TagParser
+module SocialSnippet
 
-  class << self
+  class TagParser
 
-    # Find `@snip` tags from text
-    #
-    # @param s [String or Array] parsed text
-    # @return [Array] found `@snip` tags with line_no
-    def find_snip_tags(s)
-      find_lines(s) {|line| ::SocialSnippet::Tag.is_snip_tag_line(line) }
-    end
+    class << self
 
-    # Find `@snippet` tags from text
-    #
-    # @param s [String or Array] parsed text
-    # @return [Array] found `@snippet` tags with line_no
-    def find_snippet_tags(s)
-      find_lines(s) {|line| ::SocialSnippet::Tag.is_snippet_tag_line(line) }
-    end
+      # Find `@snip` tags from text
+      #
+      # @param s [String or Array] parsed text
+      # @return [Array] found `@snip` tags with line_no
+      def find_snip_tags(s)
+        find_lines(s) {|line| Tag.is_snip_tag_line(line) }
+      end
 
-    private
-
-    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,
-              :tag => ::SocialSnippet::Tag.new(line),
-            }
-          )
+      # Find `@snippet` tags from text
+      #
+      # @param s [String or Array] parsed text
+      # @return [Array] found `@snippet` tags with line_no
+      def find_snippet_tags(s)
+        find_lines(s) {|line| Tag.is_snippet_tag_line(line) }
+      end
+
+      def find_no_tags(s)
+        find_lines(s) {|line| Tag.is_no_tag_line?(line) }
+      end
+
+      private
+
+      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,
+                :tag => Tag.new(line),
+              }
+            )
+          end
+          found_lines
         end
-        found_lines
       end
-    end
 
-    def get_lines(s)
-      if s.is_a?(String)
-        s.split($/)
-      elsif s.is_a?(Array)
-        s
-      elsif s.is_a?(Enumerator)
-        s
-      else
-        raise "error unknown data"
+      def get_lines(s)
+        if s.is_a?(::String)
+          s.split($/)
+        elsif s.is_a?(::Array)
+          s
+        elsif s.is_a?(::Enumerator)
+          s
+        else
+          raise "error unknown data"
+        end
       end
+
     end
 
   end
 
 end
+

data/lib/social_snippet/version.rb

@@ -1,6 +1,6 @@
 module SocialSnippet
 
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   module Version
 

data/spec/lib/api_spec.rb

@@ -38,7 +38,7 @@ module SocialSnippet
         let(:install_command_logger) { ::SocialSnippet::Logger.new install_command_output }
 
         before do
-          allow(fake_social_snippet).to receive(:logger).and_return install_command_logger
+          allow(fake_core).to receive(:logger).and_return install_command_logger
           install_command.init
           install_command.run
           expect(install_command_output.string).to match /Success/
@@ -48,7 +48,7 @@ module SocialSnippet
 
           let(:string_io) { ::StringIO.new }
           let(:string_logger) { ::SocialSnippet::Logger.new(string_io) }
-          before { allow(fake_social_snippet).to receive(:logger).and_return string_logger }
+          before { allow(fake_core).to receive(:logger).and_return string_logger }
 
           #
           # tests from here
@@ -70,7 +70,7 @@ module SocialSnippet
               ].join($/) + $/
             end
 
-            before { fake_social_snippet.api.insert_snippet input }
+            before { fake_core.api.insert_snippet input }
             it { expect(string_io.string).to eq expected }
 
           end # $ ssnip / without snip
@@ -83,7 +83,7 @@ module SocialSnippet
               ].join($/)
             end
 
-            before { fake_social_snippet.api.insert_snippet input }
+            before { fake_core.api.insert_snippet input }
             
             # last update: 2014-10-28
             it { expect(string_io.string).to match(/@snippet/) }

data/spec/lib/command_line/sspm_config_spec.rb

@@ -8,7 +8,7 @@ module SocialSnippet::CommandLine
 
       let(:sspm_config_command) { SSpm::SubCommands::ConfigCommand.new ["key"] }
 
-      it { expect(fake_social_snippet.api).to receive(:config_get).with("key").once }
+      it { expect(fake_core.api).to receive(:config_get).with("key").once }
 
       after do
         sspm_config_command.init
@@ -21,7 +21,7 @@ module SocialSnippet::CommandLine
 
       let(:sspm_config_command) { SSpm::SubCommands::ConfigCommand.new ["key", "value"] }
 
-      it { expect(fake_social_snippet.api).to receive(:config_set).with("key", "value").once }
+      it { expect(fake_core.api).to receive(:config_set).with("key", "value").once }
 
       after do
         sspm_config_command.init
@@ -34,7 +34,7 @@ module SocialSnippet::CommandLine
 
       let(:sspm_config_command) { SSpm::SubCommands::ConfigCommand.new ["key=value"] }
 
-      it { expect(fake_social_snippet.api).to receive(:config_set).with("key", "value").once }
+      it { expect(fake_core.api).to receive(:config_set).with("key", "value").once }
 
       after do
         sspm_config_command.init

data/spec/lib/command_line/sspm_init_spec.rb

@@ -9,7 +9,7 @@ module SocialSnippet::CommandLine
       let(:sspm_init_command) { SSpm::SubCommands::InitCommand .new [] }
 
       example do
-        expect(fake_social_snippet.api).to receive(:init_manifest).with({}).once
+        expect(fake_core.api).to receive(:init_manifest).with({}).once
         sspm_init_command.init
         sspm_init_command.run
       end

data/spec/lib/command_line/sspm_install_spec.rb

@@ -108,7 +108,7 @@ module SocialSnippet::CommandLine
     #
     let(:install_command_output) { ::StringIO.new }
     let(:install_command_logger) { ::SocialSnippet::Logger.new install_command_output }
-    before { allow(fake_social_snippet).to receive(:logger).and_return install_command_logger }
+    before { allow(fake_core).to receive(:logger).and_return install_command_logger }
 
     describe "$ sspm install" do
 
@@ -126,8 +126,8 @@ module SocialSnippet::CommandLine
 
         example do
           install_command = SSpm::SubCommands::InstallCommand.new([])
-          expect(fake_social_snippet.api).to receive(:install_repository_by_name).with("foo", "1.2.3", kind_of(Hash)).once
-          expect(fake_social_snippet.api).to receive(:install_repository_by_name).with("bar", "0.0.1", kind_of(Hash)).once
+          expect(fake_core.api).to receive(:install_repository_by_name).with("foo", "1.2.3", kind_of(Hash)).once
+          expect(fake_core.api).to receive(:install_repository_by_name).with("bar", "0.0.1", kind_of(Hash)).once
           install_command.run
         end
 
@@ -142,7 +142,7 @@ module SocialSnippet::CommandLine
 
       before do
         install_command_logger.level = ::SocialSnippet::Logger::Severity::INFO
-        allow(fake_social_snippet).to receive(:logger).and_return install_command_logger
+        allow(fake_core).to receive(:logger).and_return install_command_logger
         install_command = SSpm::SubCommands::InstallCommand.new ["my-repo"]
         install_command.init
         install_command.run
@@ -162,7 +162,7 @@ module SocialSnippet::CommandLine
 
         subject do
           install_command_logger.level = ::SocialSnippet::Logger::Severity::INFO
-          allow(fake_social_snippet).to receive(:logger).and_return second_install_command_logger
+          allow(fake_core).to receive(:logger).and_return second_install_command_logger
           install_command = SSpm::SubCommands::InstallCommand.new ["my-repo"]
           install_command.init
           install_command.run

data/spec/lib/command_line/sspm_search_spec.rb

@@ -29,7 +29,7 @@ module SocialSnippet::CommandLine
 
       let(:search_command_output) { ::StringIO.new }
       let(:search_command_logger) { ::SocialSnippet::Logger.new search_command_output }
-      before { allow(fake_social_snippet).to receive(:logger).and_return search_command_logger }
+      before { allow(fake_core).to receive(:logger).and_return search_command_logger }
 
       describe "$ search repo" do
 

data/spec/lib/context_spec.rb

@@ -2,45 +2,52 @@ require "spec_helper"
 
 describe SocialSnippet::Context do
 
-  let(:context) { SocialSnippet::Context.new("path/to/file.cpp") }
-
   describe "#move" do
 
-    context "move ./file2.cpp" do
-
-      before { context.move "./file2.cpp" }
+    context "start from path/to/file1.cpp" do
 
-      it { expect(context.path).to eq "path/to/file2.cpp" }
+      let(:context) { SocialSnippet::Context.new("path/to/file1.cpp") }
+      it { expect(context.path).to eq "path/to/file1.cpp" }
+      it { expect(context.dirname).to eq "path/to" }
       it { expect(context.repo).to be_nil }
 
-      context "move path/to/file.cpp, repo" do
+      context "move into ./file2.cpp" do
+
+        before { context.move "./file2.cpp" }
+        it { expect(context.path).to eq "path/to/file2.cpp" }
+        it { expect(context.dirname).to eq "path/to" }
+        it { expect(context.repo).to be_nil }
 
-        before { context.move "path/to/file.cpp", "repo" }
+        context "move into subdir/file3.cpp" do
 
-        it { expect(context.path).to eq "path/to/file.cpp" }
-        it { expect(context.repo).to eq "repo" }
+          before { context.move "subdir/file3.cpp" }
+          it { expect(context.path).to eq "path/to/subdir/file3.cpp" }
+          it { expect(context.dirname).to eq "path/to/subdir" }
+          it { expect(context.repo).to be_nil }
 
-        context "move subdir/file.cpp" do
+        end # move into subdir/file3.cpp
 
-          before { context.move "subdir/file.cpp" }
+        context "move into path/to/repo/file4.cpp at repo" do
 
-          it { expect(context.path).to eq "path/to/subdir/file.cpp" }
+          before { context.move "path/to/repo/file4.cpp", "repo" }
+          it { expect(context.path).to eq "path/to/repo/file4.cpp" }
+          it { expect(context.dirname).to eq "path/to/repo" }
           it { expect(context.repo).to eq "repo" }
 
-        end # move subdir/file.cpp
-
-      end # move path/to/file.cpp, repo
+          context "move into subdir/file5.cpp" do
 
-      context "move subdir/file.cpp" do
+            before { context.move "subdir/file5.cpp" }
+            it { expect(context.path).to eq "path/to/repo/subdir/file5.cpp" }
+            it { expect(context.dirname).to eq "path/to/repo/subdir" }
+            it { expect(context.repo).to eq "repo" }
 
-        before { context.move "subdir/file.cpp" }
+          end # move into subdir/file5.cpp
 
-        it { expect(context.path).to eq "path/to/subdir/file.cpp" }
-        it { expect(context.repo).to be_nil }
+        end # move into path/to/reop/file3.cpp at repo
 
-      end # move subdir/file.cpp
+      end # move into file2.cpp
 
-    end # move file2.cpp
+    end # start from path/to/file1.cpp
 
   end # move
 

data/spec/lib/core_spec.rb

@@ -16,15 +16,15 @@ module SocialSnippet
         before do
           repo_name = "my-repo"
 
-          FileUtils.mkdir_p "#{repo_path}"
-          FileUtils.mkdir_p "#{repo_path}/my-repo"
-          FileUtils.mkdir_p "#{repo_path}/my-repo/.git"
-          FileUtils.mkdir_p "#{repo_path}/my-repo/src"
-          FileUtils.touch   "#{repo_path}/my-repo/snippet.json"
-          FileUtils.touch   "#{repo_path}/my-repo/src/get_42.cpp"
+          ::FileUtils.mkdir_p "#{repo_path}"
+          ::FileUtils.mkdir_p "#{repo_path}/my-repo"
+          ::FileUtils.mkdir_p "#{repo_path}/my-repo/.git"
+          ::FileUtils.mkdir_p "#{repo_path}/my-repo/src"
+          ::FileUtils.touch   "#{repo_path}/my-repo/snippet.json"
+          ::FileUtils.touch   "#{repo_path}/my-repo/src/get_42.cpp"
 
           # snippet.json
-          File.write "#{repo_path}/my-repo/snippet.json", [
+          ::File.write "#{repo_path}/my-repo/snippet.json", [
             '{',
             '  "name": "my-repo",',
             '  "language": "C++",',
@@ -33,7 +33,7 @@ module SocialSnippet
           ].join($/)
 
           # src/get_42.cpp
-          File.write "#{repo_path}/my-repo/src/get_42.cpp", [
+          ::File.write "#{repo_path}/my-repo/src/get_42.cpp", [
             'int get_42() {',
             '  return 42;',
             '}',
@@ -48,8 +48,8 @@ module SocialSnippet
             repo
           end
 
-          allow(fake_social_snippet.repo_manager).to receive(:find_repository).with("my-repo") { repo_config.call }
-          allow(fake_social_snippet.repo_manager).to receive(:find_repository).with("my-repo", short_commit_id) { repo_config.call }
+          allow(fake_core.repo_manager).to receive(:find_repository).with("my-repo") { repo_config.call }
+          allow(fake_core.repo_manager).to receive(:find_repository).with("my-repo", short_commit_id) { repo_config.call }
         end # prepare for my-repo
 
         context "there are no @snip tags" do
@@ -76,7 +76,7 @@ module SocialSnippet
             ].join($/)
           end
 
-          subject { fake_social_snippet.api.insert_snippet(input) }
+          subject { fake_core.api.insert_snippet(input) }
           it { should eq output }
 
         end # there is no @snip tags
@@ -112,7 +112,7 @@ module SocialSnippet
             ].join($/)
           end
 
-          subject { fake_social_snippet.api.insert_snippet(input) }
+          subject { fake_core.api.insert_snippet(input) }
           it { should eq output }
 
         end # there is a @snip tag

data/spec/lib/insert_resolver_spec.rb

@@ -5,10 +5,10 @@ describe SocialSnippet::Resolvers::InsertResolver do
   context "prepare stubs" do
 
     before do
-      allow(fake_social_snippet.repo_manager).to receive(:resolve_snippet_path) do |c, t|
+      allow(fake_core.repo_manager).to receive(:resolve_snippet_path) do |c, t|
         t.repo
       end
-      allow(fake_social_snippet.repo_manager).to receive(:get_snippet) do |c, t|
+      allow(fake_core.repo_manager).to receive(:get_snippet) do |c, t|
         ::SocialSnippet::Snippet.new_text(t.repo)
       end
     end
@@ -18,7 +18,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
       describe "ruby's require()" do
 
         before do
-          allow(fake_social_snippet.repo_manager).to receive(:get_snippet) do |c, t|
+          allow(fake_core.repo_manager).to receive(:get_snippet) do |c, t|
             ::SocialSnippet::Snippet.new_text([
               "def foo",
               "  42",
@@ -28,7 +28,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
         end # prepare snippet
 
         let(:resolver) do
-          ::SocialSnippet::Resolvers::InsertResolver.new(fake_social_snippet)
+          ::SocialSnippet::Resolvers::InsertResolver.new(fake_core)
         end
 
         let(:input) do
@@ -69,7 +69,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
       context "no options" do
 
         let(:resolver) do
-          ::SocialSnippet::Resolvers::InsertResolver.new(fake_social_snippet)
+          ::SocialSnippet::Resolvers::InsertResolver.new(fake_core)
         end
 
         let(:input) do
@@ -99,7 +99,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
       context ":margin_top => 3" do
 
         let(:resolver) do
-          ::SocialSnippet::Resolvers::InsertResolver.new(fake_social_snippet, {
+          ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, {
             :margin_top => 3,
           })
         end
@@ -140,7 +140,7 @@ describe SocialSnippet::Resolvers::InsertResolver do
       context ":margin_bottom => 3" do
 
         let(:resolver) do
-          ::SocialSnippet::Resolvers::InsertResolver.new(fake_social_snippet, {
+          ::SocialSnippet::Resolvers::InsertResolver.new(fake_core, {
             :margin_bottom => 3,
           })
         end