gemignore 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/gemignore.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemignore}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lucas Jenss"]
-  s.date = %q{2011-06-10}
-  s.default_executable = %q{gemignore}
+  s.authors = [%q{Lucas Jenss}]
+  s.date = %q{2011-11-06}
   s.description = %q{gemignore allows you to automatically insert a wide range of preset .gitignore snippets into your .gitignore files}
   s.email = %q{lucas@x3ro.de}
-  s.executables = ["gemignore"]
+  s.executables = [%q{gemignore}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -34,16 +33,16 @@ Gem::Specification.new do |s|
     "lib/gemignore/main.rb",
     "lib/gemignore/util.rb",
     "spec/gemignore_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "tests/gemignore_add_test.rb"
   ]
   s.homepage = %q{http://coding-journal.com/hassle-free-gitignore-management-with-gemignore/}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{A command-line tool which ought to simplify your daily .gitignore hassle}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/gemignore/main.rb

@@ -52,6 +52,24 @@ Available commands are:
 BANNER
     end
 
+    # Check if there is an case insensitive match in the fetched snippet list, in which
+    # case a list containing only that snippet is returned. Otherwise, the entire list
+    # of snippets is retuned unmodified.
+    def searchExactMatch(snippets, keyword)
+      keyword = keyword.downcase
+      index = snippets.find_index { |x| x.downcase == keyword }
+      if index.nil?
+        snippets
+      else
+        [ snippets[index] ]
+      end
+    end
+
+    # Returns the comment that is added before a gitignore snippet
+    def gitignoreCommentForSnippet(snippet)
+      "\n\n# Added by gemignore. Snippet '#{snippet}'\n"
+    end
+
     # Displays a list of available .gitignore snippets
     def list
       msg "Available .gitignore snippets:", 1
@@ -78,11 +96,13 @@ BANNER
     # directory in case it exists and the given snippet identifier matched
     # exactly one snippet.
     def add
-      snippets = fetch(ARGV[0])
+      keyword = ARGV[0]
+      snippets = fetch(keyword)
+      snippets = searchExactMatch(snippets, keyword)
       if snippets.length < 1
-        error "No snippets found for '#{ARGV[0]}'", 1
+        error "No snippets found for '#{keyword}'", 1
       elsif snippets.length > 1
-        error "Multiple possible snippets found for '#{ARGV[0]}'.", 1
+        error "Multiple possible snippets found for '#{keyword}'.", 1
         error "Please be more specific.", 1
         snippets.each do |f|
           notice f, 2
@@ -101,7 +121,7 @@ BANNER
 
         f = File.new(".gitignore", "a")
         snippetData = fetchFile(snippet)
-        f.write("\n\n# Added by gemignore. Snippet '#{snippet}'\n" + snippetData)
+        f.write(gitignoreCommentForSnippet(snippet) + snippetData)
         f.close
 
         msg "Successfully added snippet.", 1
@@ -127,7 +147,12 @@ BANNER
       search = regexpForInput(search)
       data = Net::HTTP.get( URI.parse('http://github.com/api/v2/json/blob/all/github/gitignore/master') )
       response = JSON.parse(data)
-      files = response["blobs"].map { |k,v| t = k.split('.'); (t[0] =~ search; $1) if t.last === 'gitignore'  }
+
+      files = response["blobs"].map do |k,v|
+        t = k.split('.')
+        (t.pop; t.join('.') =~ search; $1) if t.last === 'gitignore'
+      end
+
       files.compact
     end
 
@@ -153,4 +178,5 @@ BANNER
   end
 
 
-end
+
+end

data/tests/gemignore_add_test.rb

@@ -0,0 +1,45 @@
+require 'test/unit'
+require 'pathname'
+require 'pp'
+
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'gemignore'
+
+GEMIGNORE_PATH = "../bin/gemignore"
+
+class GemIgnoreAddTest < Test::Unit::TestCase
+
+	def test_all_snippets
+		gemignore = GemIgnore::Main.new
+		snippets = gemignore.fetch('')	# Get all snippets
+
+		gitignoreLines = 0 # File should be empty, we created it in #setup
+		gitignoreCommentLength = gemignore.gitignoreCommentForSnippet('foobar').split("\n").length
+
+		snippets.each do |snippet|
+			puts %x[#{GEMIGNORE_PATH} add #{snippet}]
+
+			gitignore = File.readlines('.gitignore')
+
+			# Make sure that adding the snippet did actually add something to the file
+			assert(gitignore.length >= (gitignoreLines + gitignoreCommentLength), "Adding Snippet #{snippet} didn't actually add anything")
+			gitignoreLines = gitignore.length
+
+			# Asserting that there is not HTML in the added snippet, which would mean there
+			# was a 404 error when fetching the snippet.
+			assert(gitignore.grep(/<html>/).empty?, "Adding Snippet #{snippet} failed (HTML in the .gitignore file)")
+		end
+	end
+
+	def setup
+		# Change CWD to tests/ so that we don't accidentally modify another .gitignore file
+		Dir.chdir(File.dirname(__FILE__))
+
+		# Clear potential old .gitignore file
+		File.delete('.gitignore') if File.exists?('.gitignore')
+		File.new('.gitignore', 'w')
+	end
+
+end

metadata

@@ -1,120 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gemignore
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Lucas Jenss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-10 00:00:00 +02:00
-default_executable: gemignore
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70346489392340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70346489392340
+- !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70346489390960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70346489390960
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70346489389620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70346489389620
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70346489388420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70346489388420
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70346489387220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70346489387220
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70346489385860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-description: gemignore allows you to automatically insert a wide range of preset .gitignore snippets into your .gitignore files
+  version_requirements: *70346489385860
+description: gemignore allows you to automatically insert a wide range of preset .gitignore
+  snippets into your .gitignore files
 email: lucas@x3ro.de
-executables: 
+executables:
 - gemignore
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Changelog
@@ -131,38 +103,33 @@ files:
 - lib/gemignore/util.rb
 - spec/gemignore_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- tests/gemignore_add_test.rb
 homepage: http://coding-journal.com/hassle-free-gitignore-management-with-gemignore/
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4383186091217616758
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2488779062565889007
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A command-line tool which ought to simplify your daily .gitignore hassle
 test_files: []
-