hubignore 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84b29a10ad0f136e320039268f03370318dbb06
-  data.tar.gz: 8be968759eaca4cf895da4c09f068bc81eb0d7f7
+  metadata.gz: 16875e0b4f2c73aa48d667b33a6aa4189505b190
+  data.tar.gz: e3302b448235cdb7a08ab1189529c015c4961ed9
 SHA512:
-  metadata.gz: 4dda48321b25a6b683cd502d237d20e0badebf2402247d8b85518723b79a1e3779d1dcfd26dfd2004afed5d118d02ea9d7abced017a69b4f520005e52df76c05
-  data.tar.gz: 93bffd190bd5ea911e717dc473e51a1c00166f1871a26c081be9815ae593b0cb45ad1f3f2151fe08c062d92c70a09cb259de2fc325d910173285fce44539a55e
+  metadata.gz: 747d6faa487115641998f09c401903d766a0e1936bf664840851a91ea82f94c6600dd31fa8618507274cd657f793772a42343640226d40a3cb5d49547c941d18
+  data.tar.gz: 27aea072b89e206982580b1d46f8f9343488262b855f0014adb1cca10554feeb2001d2692878664535dfbc3ad10f301191a9ec27a1d681e1eff8407853f1b542

data/lib/hubignore.rb

@@ -2,6 +2,7 @@ require 'colored'
 require 'hubignore/version'
 require 'net/http'
 require 'uri'
+require 'open-uri'
 
 # The main class of HubIgnore
 class HubIgnore
@@ -15,10 +16,10 @@ class HubIgnore
 
   def parse_argv(argv)
     help = <<EOS
-$ hubignore -v --version # show version
-$ hubignore -l --list # list git ignores in current .gitignore
-$ hubignore -u --update # update git ignores in current .gitignore to upstream
-$ hubignore -h --help # show this help message
+  $ hubignore -v --version # show version
+  $ hubignore -l --list # list git ignores in current .gitignore
+  $ hubignore -u --update # update git ignores in current .gitignore to upstream
+  $ hubignore -h --help # show this help message
 EOS
 
     case argv
@@ -43,7 +44,7 @@ EOS
   def items
     items = []
     file = IO.read('.gitignore')
-    file.scan(/\#\# HubIgnore Begin:.*?\#\# HubIgnore End./m).each do |block|
+    file.scan(/^\#\#\s*HubIgnore Begins?:.*^\#\#\s*HubIgnore End.?$/mi).each do |block|
       first_line = block.lines.first
       items << first_line.split(':')[1].split(',').map(&:strip)
     end
@@ -56,27 +57,25 @@ EOS
   end
 
   def update
-    items.each do |item|
-      content = "\#\# HubIgnore Begin: #{item.join(', ')}\n"
-      item.each do |file|
+    content = IO.read('.gitignore')
+    new_content = content.gsub(/^\#\#\s*HubIgnore Begins?:.*^\#\#\s*HubIgnore End.?$/mi) do |block|
+      first_line = block.lines.first
+      result = first_line
+      first_line.split(':')[1].split(',').map(&:strip).each do |file|
         next if file.empty?
         puts "Downloading #{file}"
-        content += "\#\# #{file} Begins:\n"
-        content += Net::HTTP.get(
-          URI.parse(
-            'https://raw.githubusercontent.com/github/'\
-            "gitignore/master/#{file}.gitignore"))
-        content += "\n"
-      end
-      item.map! do |name|
-        Regexp.escape(name)
+        result += "\#\# #{file} Begins:\n"
+        uri = URI.parse(
+          'https://raw.githubusercontent.com/github/'\
+          "gitignore/master/#{file}.gitignore"
+        )
+        result += uri.read
+        result += "\n"
       end
-      content += '## HubIgnore End.'
-      file = IO.read('.gitignore')
-      file = file.gsub(
-        /\#\# HubIgnore Begin: *#{item.join(' *, *')} *.*?\#\# HubIgnore End./m,
-        content)
-      IO.write('.gitignore', file)
+      result += block.lines.last
+      result
     end
+
+    IO.write('.gitignore', new_content)
   end
 end

data/lib/hubignore/version.rb

@@ -1,4 +1,4 @@
 # The version class of HubIgnore
 class HubIgnore
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubignore
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jiege Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -43,9 +43,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Download and manage git ignores from github/gitignore.
 test_files: []
-has_rdoc: