annotate_gem 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047f6b2c6f2fb2d56e8fde53ba869c87000697b6
-  data.tar.gz: f98ae9c02b0f80371fca64018519ceb587ed1e39
+  metadata.gz: e19ea744fca0e12094d208b16959a8d80e343769
+  data.tar.gz: 38bbd3f8c59b331f7346caac39d8420aa1680049
 SHA512:
-  metadata.gz: bc0f28fcfa956836ff846c9fcde3fa39fb3d98834a8910aabdc1c3c140895cc1b0acb105b8fc9ed25cd49c414dabd4dd56501135c966ba732267f1a16511a661
-  data.tar.gz: dda56b77cfe1b700581bb1be90e94e733fd1845c3d4c5c38be965decdda5d3932a4ef1eaee2c7e9b3961a5733a4e72289f7a36abe60f683599a693447f325db6
+  metadata.gz: d71370492e61059f406c03f527aa6512c09fa901ff273ca5a853f34cca6c7e6ba8345b4a2c237ae820e32996a194de42a2cf1e503050d3cdc130a1e484d101b1
+  data.tar.gz: 1122146e16934a15a511cd0e072745bd68c52385d51083c33396697ad0cf1423204df64d0188ae1a5ebec5407b8590a73cd4c30ca2e8a502f24da5291f879fa7

data/lib/annotate_gem/gem_line.rb

@@ -17,6 +17,10 @@ module AnnotateGem
       comment = "#{leading_spaces}# #{info}"
     end
 
+    def inline_comment
+      "#{original_line.chomp} # #{info}"
+    end
+
     def info
       output = if options[:website_only]
         website
@@ -35,12 +39,16 @@ module AnnotateGem
     private
 
     def already_added_comment
-      prev_line_comment && prev_line_comment.include?(comment)
+      !options[:inline] && prev_line_comment && prev_line_comment.include?(comment)
     end
 
     # if there exists a prev_line_comment and the user has specified new_comments_only
     def existing_comment_option
-      prev_line_comment && options[:new_comments_only]
+      (options[:new_comments_only] && prev_line_comment) || (options[:inline] && original_line_has_comment?)
+    end
+
+    def original_line_has_comment?
+      original_line.include?("#")
     end
 
     def leading_spaces_count

data/lib/annotate_gem/gemfile.rb

@@ -31,7 +31,12 @@ module AnnotateGem
 
     def write_comments
       gem_lines.reverse.each do |gem_line|
-        source.insert(gem_line.location, gem_line.comment) if gem_line.should_insert?
+        next unless gem_line.should_insert?
+        if options[:inline]
+          source[gem_line.location] = gem_line.inline_comment
+        else
+          source.insert(gem_line.location, gem_line.comment)
+        end
       end
       File.write(gemfile_path, source.join)
     end

data/lib/annotate_gem/options.rb

@@ -38,9 +38,13 @@ module AnnotateGem
     end
 
     def add_gemfile_comment_options(opts)
-      opts.on("--new-comments-only", "Only add a comment to gemfile if there isn't a comment already") do
+      opts.on("--new-comments-only", "Only add a comment to gemfile if there isn't a comment already (for non-inline comments)") do
         options[:new_comments_only] = true
       end
+
+      opts.on("--inline", "Inline the comment") do
+        options[:inline] = true
+      end
     end
 
     def add_banner(opts)

data/lib/annotate_gem/version.rb

@@ -1,4 +1,4 @@
 module AnnotateGem
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.11".freeze
   DESCRIPTION = "Add comments to your Gemfile with each dependency's description.".freeze
 end

data/test/annotate_gem/gem_line_test.rb

@@ -51,6 +51,16 @@ class AnnotateGem::GemLineTest < Minitest::Test
     refute gem_line.should_insert?
   end
 
+  def test_should_insert__with_inline_and_existing_comment
+    gem_line = create_gem_line(
+      original_line: "gem 'annotate_gem' # This is an existing comment\n",
+      options: { inline: true }
+    )
+    spec = stub(summary: "Hello world", homepage: "http://example.com")
+    gem_line.spec = spec
+    refute gem_line.should_insert?
+  end
+
   def test_comment
     gem_line = create_gem_line
     spec = stub(summary: "Hello world", homepage: "http://example.com")

data/test/annotate_gem/gemfile_test.rb

@@ -46,6 +46,16 @@ class AnnotateGem::GemfileTest < Minitest::Test
     end
   end
 
+  def test_write_comments_with_inline
+    with_gemfile("gem 'rails'") do |path|
+      gemfile = AnnotateGem::Gemfile.new(path, inline: true)
+      gemfile.gem_lines = [mock(location: 0, inline_comment: "gem 'rails' # Rails description!\n", should_insert?: true)]
+      gemfile.source = ["gem 'rails'"]
+      gemfile.write_comments
+      assert_equal "gem 'rails' # Rails description!\n", File.read(path)
+    end
+  end
+
   def test_that_options_are_passed_through
     AnnotateGem::GemLine.expects(:new).with(
       name: "rails",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotate_gem
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ivan Tse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler