gemignore 0.3.0 → 0.4.0

data/.yardopts

@@ -0,0 +1 @@
+--private -m markdown

data/Changelog

@@ -1,3 +1,19 @@
+== 0.4.0
+  * Add shortcuts for gemignore commands
+  * Switch to GitHub API v3 (using Octokit)
+  * Add request caching for better performance
+  * Add support for searching and adding multiple snippets at once
+  * Table-like output for "list" and "search" commands
+  * Add slightly better error handling (e.g. no internet connection)
+  * Add new "peek" subcommand to look at a snippet without adding it
+
+== 0.3.0
+  * Fix bugs that prevented certain snippets from being added
+  * Add unit tests for adding snippets
+
+== 0.2.1
+  * Fix compatibility issues with new GitHub API
+
 == 0.2.0
   * Add colored messages
   * Fix bug which prevented one from installing the 'Go' snippet
@@ -5,4 +21,4 @@
   * Add usage information accessible from command line
 
 == 0.1.1
-  * First release
+  * First release

data/Gemfile

@@ -4,12 +4,14 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "json", ">= 1.5.1"
 gem "rainbow", "~> 1.1.1"
+gem "octokit", "~> 1.0.5"
+gem "terminal-table", "~> 1.4.5"
+gem "ruby-terminfo", "~> 0.1.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec", "~> 2.10.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
 end

data/README.md

@@ -0,0 +1,40 @@
+# gemignore
+
+This is a handy little tool for all people who work with Git. It allows you to easily add .gitignore snippets to the .gitignore file in your current working directory. The snippets are taken from https://github.com/github/gitignore , so if there is anything missing, feel free to fork that repository and create a pull request :)
+
+# Installation
+
+    $ gem install gemignore
+
+# Usage
+
+To search for a .gitignore snippet, simply type
+
+    $ gemignore search lin    # or
+	$ gemignore s lin
+
+To list all available snippets run
+
+    $ gemignore list    # or
+	$ gemignore l
+
+And finally, to add a snippet to the .gitignore file in the **current working directory**:
+
+    $ gemignore add Global/OSX    # or
+	$ gemignore a osx
+
+To display usage information you can use
+
+    $ gemignore help
+
+
+# Licensed under the [MIT License](http://www.opensource.org/licenses/mit-license.php)
+
+Copyright (c) 2012 Lucas Jenß
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Rakefile

@@ -39,7 +39,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/gemignore

@@ -5,4 +5,4 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'gemignore'
 
-GemIgnore::Main.new.dispatch
+GemIgnore::Main.new.dispatchWithErrorHandling

data/gemignore.gemspec

@@ -4,43 +4,42 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gemignore}
-  s.version = "0.3.0"
+  s.name = "gemignore"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  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 = [%q{gemignore}]
+  s.authors = ["Lucas Jenss"]
+  s.date = "2012-05-24"
+  s.description = "gemignore allows you to automatically insert a wide range of preset .gitignore snippets into your .gitignore files"
+  s.email = "lucas@x3ro.de"
+  s.executables = ["gemignore"]
   s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
     ".rspec",
+    ".yardopts",
     "Changelog",
     "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "bin/.gitignore",
     "bin/gemignore",
     "gemignore.gemspec",
     "lib/gemignore.rb",
+    "lib/gemignore/github.rb",
     "lib/gemignore/main.rb",
     "lib/gemignore/util.rb",
     "spec/gemignore_spec.rb",
-    "spec/spec_helper.rb",
-    "tests/gemignore_add_test.rb"
+    "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://coding-journal.com/hassle-free-gitignore-management-with-gemignore/}
-  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}
+  s.homepage = "http://coding-journal.com/hassle-free-gitignore-management-with-gemignore/"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "A command-line tool which ought to simplify your daily .gitignore hassle"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -48,25 +47,31 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
       s.add_runtime_dependency(%q<rainbow>, ["~> 1.1.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<octokit>, ["~> 1.0.5"])
+      s.add_runtime_dependency(%q<terminal-table>, ["~> 1.4.5"])
+      s.add_runtime_dependency(%q<ruby-terminfo>, ["~> 0.1.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 1.5.1"])
       s.add_dependency(%q<rainbow>, ["~> 1.1.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<octokit>, ["~> 1.0.5"])
+      s.add_dependency(%q<terminal-table>, ["~> 1.4.5"])
+      s.add_dependency(%q<ruby-terminfo>, ["~> 0.1.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.5.1"])
     s.add_dependency(%q<rainbow>, ["~> 1.1.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<octokit>, ["~> 1.0.5"])
+    s.add_dependency(%q<terminal-table>, ["~> 1.4.5"])
+    s.add_dependency(%q<ruby-terminfo>, ["~> 0.1.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/gemignore.rb

@@ -1,4 +1,9 @@
 module GemIgnore
 end
 
-require 'gemignore/main'
+lib = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'gemignore/util'
+require 'gemignore/github'
+require 'gemignore/main'

data/lib/gemignore/github.rb

@@ -0,0 +1,98 @@
+require 'octokit'
+require 'base64'
+require 'tmpdir'
+require 'json'
+
+# This class implements the necessary high-level operations we need to perform on the
+# GitHub API and caches them. "High-level", because most of them are already pre-processed
+# to fit what is needed in gemignore, whereas "low-level" operations are those directly
+# performed on the GitHub API
+#
+class GitHub
+
+  CACHE_LIFETIME = 60 * 30 # seconds
+
+  # Path to our temporary cache file
+  @tmpFile = Dir.tmpdir + '/' + 'gemignoretemp'
+
+
+  # Try to load cache from temporary file
+  if File.exists? @tmpFile
+    @cache = JSON.parse(File.open(@tmpFile,'rb').read)
+    @cache = nil if (Time.now.to_i - @cache["creationTime"]) > CACHE_LIFETIME
+  end
+
+  @cache ||= { "creationTime" => Time.now.to_i }
+
+
+  class << self
+    # Path to the temporary file where we store our cache object. Necessary so that we can
+    # access the path in the finalizer.
+    #
+    attr_reader :tmpFile
+
+    # The object which is used to cache requests. Necessary so that we may access the cache
+    # object in the finalizer.
+    #
+    attr_reader :cache
+  end
+
+
+  # This finalizer is used to write the cache object to a temporary file when the program
+  # exits. We try to load the cache object from the file when this class is created.
+  #
+  ObjectSpace.define_finalizer(self, proc do
+    File.open(self.tmpFile, 'w').write(JSON.generate(self.cache))
+  end)
+
+
+  # Retrieve the full list of files available inside the given repository + tree.
+  #
+  def self.fileList(repo, tree_sha)
+    idArray = ["fileList", repo, tree_sha]
+    cache = readCache(idArray)
+    return cache if not cache.nil?
+
+    tree = Octokit.tree(repo, tree_sha, :recursive => 1).tree
+    writeCache(idArray, Hash[*tree.flat_map { |t| [t.path, t.sha] }])
+  end
+
+
+  # Retrieves a file's contents identified by its blob's SHA hash
+  #
+  def self.getFile(repo, sha)
+    idArray = ['getFile', repo, sha]
+    cache = readCache(idArray)
+    return cache if not cache.nil?
+
+    res = Octokit.blob(repo, sha)
+    data = nil
+    case res.encoding
+      when "base64"
+        data = Base64.decode64(res.content)
+      when "utf-8"
+        data = res.content
+      else
+        raise NotImplementedError.new("Could not decode response from GitHub API")
+    end
+    self.writeCache(idArray, data)
+  end
+
+
+  private
+
+  # Write a value to our cache object.
+  def self.writeCache(idArray, value)
+    raise ArgumentError.new("idArray parameter must be an array") if not idArray.is_a? Array
+    id = idArray.join("$")
+    @cache[id] = value
+  end
+
+
+  def self.readCache(idArray)
+    id = idArray.join("$")
+    @cache[id]
+  end
+
+end
+

data/lib/gemignore/main.rb

@@ -4,54 +4,91 @@ require 'net/http'
 require 'net/https'
 require 'json'
 
-require 'gemignore/util'
 
 module GemIgnore
 
-  #--
-  # FIXME: Not a good name, but for now its okay
-  # FIXME: Add documentation
-  # FIXME: Cleanup code
-  #++
+  # This is where the core functionality of GemIgnore lies
   class Main
 
     include Util
 
-    def dispatch
+    # Set the repository and branch where we want to retrieve the snippets from
+    def initialize
+      @snippetRepository = 'github/gitignore'
+      @snippetBranch = 'master'
+    end
+
+
+    # Default entry point when running from command line
+    def dispatchWithErrorHandling
+      debugMode = (not ARGV.delete("-d").nil?)
+
+      begin
+        dispatch(ARGV.dup)
+      rescue CommandError => e
+        raise e if debugMode
+        error e.message
+        help
+        exit
+      rescue Exception => e
+        raise e if debugMode
+        error "An error occured (are you connected to the internet?)"
+        error "For more information run gemignore with the '-d' option."
+      end
+    end
+
 
-      (help; return) if ARGV.length === 0
+    # Invokes the correct method according to the command line options that were given
+    def dispatch(arguments)
+      raise CommandError.new("Not enough arguments given.") if arguments.empty?
 
-      cmd = ARGV.shift # get the sub-command
+      cmd = arguments.shift # get the sub-command
       case cmd
-        when "list"
+        when "list", "l"
           list
-        when "search"
-          search
-        when "add"
-          add
+        when "peek", "p"
+          raise CommandError.new("No arguments given for 'peek' command.") if arguments.empty?
+          view(arguments)
+        when "search", "s"
+          raise CommandError.new("No arguments given for 'search' command.") if arguments.empty?
+          search(arguments)
+        when "add", "a"
+          raise CommandError.new("No arguments given for 'add' command.") if arguments.empty?
+          add(arguments)
         when "help"
           help
         else
-          error "Unknown gemignore command '#{cmd}'."
-          notice "Run 'gemignore help' to display usage information."
+          raise CommandError.new("Unknown gemignore command '#{cmd}'.")
+          help
       end
-
     end
 
+
     # Displays some usage information
     def help
-      notice <<-BANNER
+      msg <<-BANNER
 gemignore - .gitignore snippet utility
 usage: gemignore <command> <input>
 
-Available commands are:
-  list    Lists all available snippets
-  search  Searches for snippets containing <input>
-  add     Add a snippet to the .gitignore file in your working directory
-  help    Display this message
+Available commands are (shortcut in parentheses):
+  (l)ist      Lists all available snippets
+  (p)eek      Show contents of given snippets
+  (s)earch    Searches for snippets containing <input>
+  (a)dd       Add a snippet identified by <input> to the .gitignore file in your working directory
+  help        Display this message
+
+You may use the either the full command or the shortcut, e.g.:
+
+  gemignore add linux osx
+
+is equivalent to
+
+  gemignore a linux osx
+
 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.
@@ -65,40 +102,61 @@ BANNER
       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
-      fetch().each do |f|
-        notice f, 2
+      puts table(fetch())
+    end
+
+
+    # Displays the contents of the matched snippets
+    def view(args)
+      findSnippets(args) do |s|
+        notice "Displaying snippet '#{s}'", 2
+        puts fetchFile(s)
       end
     end
 
+
     # Searches for a given snippet name
-    def search
-      results = fetch(ARGV[0])
+    def search(args)
+      keyword = args.shift
+      results = fetch(keyword)
+
       if(results.length < 1)
-        error "No snippets found for '#{ARGV[0]}'", 1
+        error "No snippets found for '#{keyword}'", 1
       else
-        msg "Snippets found for '#{ARGV[0]}':", 1
-        results.each do |f|
-          notice f, 2
-        end
-
+        msg "Snippets found for '#{keyword}':", 1
+        puts table(results)
       end
+
+      search(args) if not args.empty?
     end
 
+
     # Adds the snippet to the .gitignore file in the current working
     # directory in case it exists and the given snippet identifier matched
     # exactly one snippet.
-    def add
-      keyword = ARGV[0]
+    def add(args)
+      findSnippets(args) { |s| performAdd(s) }
+    end
+
+
+    # Searches for snippets matching the given keywords (an individual search is performed
+    # for every array element. The passed block is called with the name of every found
+    # snippet (excluding the '.gitignore' suffix)
+    def findSnippets(args, &block)
+      keyword = args.shift
       snippets = fetch(keyword)
       snippets = searchExactMatch(snippets, keyword)
+
       if snippets.length < 1
         error "No snippets found for '#{keyword}'", 1
       elsif snippets.length > 1
@@ -108,10 +166,13 @@ BANNER
           notice f, 2
         end
       else
-        performAdd(snippets.first)
+        block.call snippets.first
       end
+
+      findSnippets(args, &block) if not args.empty?
     end
 
+
     # Adds the given snippet in case the .gitignore file exists.
     def performAdd(snippet)
       if not File.exists?(".gitignore")
@@ -128,6 +189,7 @@ BANNER
       end
     end
 
+
     # Creates a Regexp for the given string. Will be case-insensitive if the
     # input does not contain any uppercase characters. Wildcards are
     # added before and after the input, so the regex will match anything containing
@@ -139,44 +201,30 @@ BANNER
       Regexp.new("(.*#{input}.*)", opt)
     end
 
+
     # Fetches the list of available snippets via the GitHub API
-    #--
-    # FIXME: Do some (url) refactoring
-    #++
+    #
     def fetch(search = nil)
       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 do |k,v|
-        t = k.split('.')
+      files = GitHub.fileList(@snippetRepository, @snippetBranch).keys
+      files.map! do |f|
+        t = f.split('.')
         (t.pop; t.join('.') =~ search; $1) if t.last === 'gitignore'
       end
-
       files.compact
     end
 
+
     # Fetches a snippet file from GitHub
-    #--
-    # FIXME: Do some (url) refactoring
-    #++
+    #
     def fetchFile(snippet)
-      url = URI.parse("https://raw.github.com/github/gitignore/master/#{snippet}.gitignore")
+      files = GitHub.fileList(@snippetRepository, @snippetBranch)
+      sha = files["#{snippet}.gitignore"]
 
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true if url.scheme == "https"  # enable SSL/TLS
+      raise ArgumentError.new("No gitignore snippet matching '#{snippet}' found") if sha.nil?
 
-      data = ""
-      http.start do
-        http.request_get(url.path) do |res|
-          data = res.body
-        end
-      end
-
-      data
+      GitHub.getFile(@snippetRepository, sha)
     end
   end
-
-
-
 end

data/lib/gemignore/util.rb

@@ -1,24 +1,58 @@
+require 'terminfo'
+require 'terminal-table'
+
 module GemIgnore
+
+  # Exceptions thrown if GemIgnore receives wrong command line arguments
+  #
+  class CommandError < ArgumentError
+  end
+
+
+  # Module to encapsulate some utility functions used within GemIgnore
+  #
   module Util
 
     def msg(msg, level=0)
+      puts (prefix(level) + msg)
+    end
+
+
+    def success(msg, level=0)
       puts (prefix(level) + msg).foreground(:green)
     end
 
+
     def notice(msg, level=0)
       puts (prefix(level) + msg).foreground(:yellow)
     end
 
+
     def error(msg, level=0)
       puts (prefix(level) + msg).foreground(:red)
     end
 
+
     def prefix(level)
       return "" if level <= 0
       ("-" * level) + "> "
     end
 
+    def table(items)
+      maxLength = (items.map { |e| e.length }).max
+
+      columns = TermInfo.screen_size[1]
+      itemsPerRow = (columns/maxLength).floor
 
+      itemsInRows = items.reduce([[]]) do |memo, obj|
+        memo.push([]) if memo.last.length >= itemsPerRow
+        memo.last.push(obj)
+        memo
+      end
 
+      table = Terminal::Table.new :rows => itemsInRows
+      table.style = {:border_x => "", :border_i => "", :border_y => ""}
+      table.to_s
+    end
   end
-end
+end

data/spec/gemignore_spec.rb

@@ -1,5 +1,74 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+GEMIGNORE_PATH = "../bin/gemignore"
+
 describe "Gemignore" do
 
+  # Basic usage tests
+
+  it "should not throw an error when listing all snippets" do
+    lambda { GemIgnore::Main.new.dispatch(["l"]) }.should_not raise_error
+    lambda { GemIgnore::Main.new.dispatch(["list"]) }.should_not raise_error
+  end
+
+  it "should not throw an error when peeking into a snippet" do
+    lambda { GemIgnore::Main.new.dispatch(["p", "Actionscript"]) }.should_not raise_error
+    lambda { GemIgnore::Main.new.dispatch(["peek", "Actionscript"]) }.should_not raise_error
+  end
+
+  it "should not throw an error when search for a snippet" do
+    lambda { GemIgnore::Main.new.dispatch(["search", "lin"]) }.should_not raise_error
+    lambda { GemIgnore::Main.new.dispatch(["s", "lin"]) }.should_not raise_error
+  end
+
+  it "should be able to successfully add all snippets" do
+    # 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')
+
+    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
+      (gitignore.length >= (gitignoreLines + gitignoreCommentLength)).should be true
+      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.
+      gitignore.grep(/<html>/).should be_empty
+    end
+  end
+
+
+
+  # Error scenarios
+
+  it "should throw an error when a wrong subcommand is passed" do
+    lambda { GemIgnore::Main.new.dispatch(["foobarbaz"]) }.should raise_error(GemIgnore::CommandError)
+  end
+
+  it "should throw an error when no subcommand is passed" do
+    lambda { GemIgnore::Main.new.dispatch([]) }.should raise_error(GemIgnore::CommandError)
+  end
+
+
+
+  # Low - level tests
+
+  it "should fetch the file list without .gitignore extension" do
+    x = GemIgnore::Main.new.fetch
+    x.each { |i| i.split('.').last.should_not eq('gitignore') }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemignore
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70346489392340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70346489392340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70346489390960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +37,95 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70346489390960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: ruby-terminfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346489389620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70346489389620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70346489388420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70346489388420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70346489387220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,18 +133,12 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70346489387220
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70346489385860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70346489385860
+        version: 1.6.0
 description: gemignore allows you to automatically insert a wide range of preset .gitignore
   snippets into your .gitignore files
 email: lucas@x3ro.de
@@ -84,26 +146,25 @@ executables:
 - gemignore
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .rspec
+- .yardopts
 - Changelog
 - Gemfile
-- LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/.gitignore
 - bin/gemignore
 - gemignore.gemspec
 - lib/gemignore.rb
+- lib/gemignore/github.rb
 - lib/gemignore/main.rb
 - lib/gemignore/util.rb
 - spec/gemignore_spec.rb
 - spec/spec_helper.rb
-- tests/gemignore_add_test.rb
 homepage: http://coding-journal.com/hassle-free-gitignore-management-with-gemignore/
 licenses:
 - MIT
@@ -119,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2488779062565889007
+      hash: -4292039963005680038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A command-line tool which ought to simplify your daily .gitignore hassle

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Lucas Jenß
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,27 +0,0 @@
-= gemignore
-
-This is a handy little tool for all people who work with Git. It allows you to easily add .gitignore snippets to the .gitignore file in your current working directory. The snippets are taken from https://github.com/github/gitignore , so if there is anything missing, feel free to fork that repository and create a pull request :)
-
-= Usage
-
-To search for a .gitignore snippet, simply type
-
-    $ gemignore search searchword
-
-To list all available snippets run
-
-    $ gemignore list
-
-And finally, to add a snippet to the .gitignore file in the <b>current working directory</b>:
-
-    $ gemignore add Global/OSX
-
-To display usage information you can use
-
-    $ gemignore help
-
-== Copyright
-
-Copyright (c) 2011 Lucas Jenß. See LICENSE.txt for
-further details.
-

data/tests/gemignore_add_test.rb

@@ -1,45 +0,0 @@
-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