forgitter 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31dec0e188603cd0a2ec62fe097f63b42889d9c3
-  data.tar.gz: ac2b7d96e72d4b8ff8cc7d6eee3e9bd260c1bdea
+  metadata.gz: 8d44216e88b2115622aee6a44f918ee7df6f71c7
+  data.tar.gz: eeeca1a668d6ca1750ba9ca0ee3cc8c7fa0d11ba
 SHA512:
-  metadata.gz: f9fa43d579eb4fea233a51567fb8694aec13b5628d20764547267ebf170aec81a23d761c25780371a2e69d894805b3ee1125255aee3643d547b6e8a0132608ea
-  data.tar.gz: f691c007e0db6b955ac82d1a487c2e3db61a69e9cfcefb970d02c19770abe065a08f91065c6f6a264005579d24b4c5a80691228cb681ef4243c0e80eb4240a9d
+  metadata.gz: a363100e6e7a990e22a345675d8cb7686fc35f7be3bb1ce25dd1c8109993057b5d60252064e0aa5ee0c9a5749bbea1d287b93722320807a9131f87b87f85d935
+  data.tar.gz: 0e0e10e8ba8404a24fb2f6eabdb92d8ae54d67ae7e6dd1aae5c4586f133be3cd32f2f66372a3f65e0b2d0ffb8a426ef22e4963bb3c1b2a174c82061637c0784f

data/bin/forgitter

@@ -6,9 +6,9 @@ require 'forgitter/cli'
 option_parser = Forgitter::CLI::OptionParser.new
 options = option_parser.parse(ARGV)
 
-options[:types] = []
-options[:types] << ARGV.pop until ARGV.empty?
-if options[:types].empty?
+options[:tags] = []
+options[:tags] << ARGV.pop until ARGV.empty?
+if options[:tags].empty?
   puts option_parser.help
   exit(1)
 end

data/lib/forgitter/cli/option_parser.rb

@@ -13,15 +13,14 @@ module Forgitter
         @options = Forgitter::DEFAULT_OPTIONS
 
         @opt_parser = ::OptionParser.new do |opts|
-          opts.banner = 'Usage: forgitter TYPE1 [TYPE2 ...]'
+          opts.banner = 'Usage: forgitter TAG1 [TAG2 ...]'
 
           opts.separator ''
           opts.separator 'Specific options:'
 
           opts.on('-l', '--list [TAGS]',
-                  'List the available types.',
-                  '    You may optionally provide a comma-separated list of tags to search for.') do |tags|
-            tags =  tags.nil? ? [] : tags.split(',')
+                  'List the available types. You may optionally provide a comma-separated list of tags to search for.') do |tags|
+            tags = tags.nil? ? [] : tags.split(',')
             Forgitter.list_types(tags)
             exit
           end

data/lib/forgitter/options.rb

@@ -2,7 +2,7 @@ require 'forgitter/types'
 
 module Forgitter
   DEFAULT_OPTIONS = {
-    :types => [],
+    :tags => [],
     :stdout => false
   }
 end

data/lib/forgitter/runner.rb

@@ -3,7 +3,7 @@ require 'forgitter'
 module Forgitter
   class Runner
     def initialize(options = Forgitter::DEFAULT_OPTIONS)
-      @types = convert_to_filenames(options[:types])
+      @types = Forgitter.filter_types(options[:tags])
       @stdout = options[:stdout]
     end
 
@@ -11,7 +11,7 @@ module Forgitter
       failcnt = 0
       output = ''
       @types.each do |type|
-        ignore_file = get_ignore_file(type)
+        ignore_file = get_ignore_file(type[:path])
         if ignore_file
           output += "# Information from #{type}\n"
           output += ignore_file
@@ -42,16 +42,5 @@ module Forgitter
         false
       end
     end
-
-    # converts "rails" or "Rails" into "Rails.gitignore"
-    def convert_to_filenames(names)
-      names.map do |name|
-        conversion_table[name.downcase.gsub(/[^+a-z]/i, '')]
-      end.compact
-    end
-
-    def conversion_table
-      Forgitter::TYPES
-    end
   end
 end

data/lib/forgitter/types.rb

@@ -1,22 +1,83 @@
+require 'debugger'
 module Forgitter
-  def self.parameterize(name)
-    name.gsub(/[^a-z0-9+]+/i, '').downcase
+  ##
+  # Strip unnecessary characters and downcase the given string.
+  #
+  # @param [String] any string
+  # @return [String] the "parameterized" string
+  #
+  def self.parameterize(str)
+    str.gsub(/[^a-z0-9+]+/i, '').downcase
   end
 
+  ##
+  # Filter types by tags.
+  #
+  # If tags is empty, this will return all types.
+  #
+  # @param [Array] the array of type names and/or tag strings
+  # @return [Array] the array of filtered types
+  #
+  def self.filter_types(tags = [])
+    types.select do |type|
+      tags.empty? || (tags - type[:tags]).empty? || tags.include?(type[:name])
+    end
+  end
+
+  ##
+  # Fetch all available type paths, relative to the DATA_PATH.
+  #
+  # @return [Array] the array of available type paths
+  #
+  def self.paths
+    @@paths ||= Dir["#{DATA_PATH}/**/*.gitignore"].map do |path|
+      path.sub("#{DATA_PATH}/", '')
+    end
+  end
+
+  ##
+  # Pull a parameterized type out of the given path.
+  #
+  # @param [String] the path to a .gitignore file
+  # @return [String] the type
+  #
+  def self.type(path)
+    parameterize(File.basename(path).sub('.gitignore', ''))
+  end
+
+  ##
+  # Pull parameterized tags out of the given path.
+  #
+  # If path does not contain a /, this returns an empty array.
+  #
+  # @param [String] the path to a .gitignore file
+  # @return [Array] the tags
+  #
+  def self.tags(path)
+    tags = []
+    if path =~ /\//
+      tags = path.sub("/#{File.basename(path)}", '').split('/')
+      tags.map! do |tag|
+        parameterize(tag)
+      end
+    end
+    tags
+  end
+
+  ##
+  # Fetch all available types.
+  #
+  # @return [Array] the array of available types
+  #
   def self.types
     unless defined?(@@types) && !@@types.empty?
       @@types = []
 
-      paths = Dir["#{DATA_PATH}/**/*.gitignore"].map { |f| f.sub("#{DATA_PATH}/", '') }
       paths.each do |path|
-        type = parameterize(File.basename(path).sub('.gitignore', ''))
-        tags = []
-        tags = path.sub("/#{File.basename(path)}", '').split('/').map { |tag| parameterize(tag) } if path =~ /\//
-
         @@types << {
           :path => path,
-          :name => type,
-          :tags => tags
+          :name => type(path),
+          :tags => tags(path)
         }
       end
     end
@@ -24,20 +85,18 @@ module Forgitter
   end
 
   def self.list_types(tags = [])
-    types = self.types.select { |type| tags.empty? || (tags - type[:tags]).empty? }
-
+    types = filter_types(tags)
     if types.empty?
       puts 'No types found!'
     else
       lines = []
       col1size = 0
+
       types.each do |type|
         col1size = type[:name].length if type[:name].length > col1size
-        lines << [type[:name], "https://github.com/github/gitignore/blob/master/#{type[:path]}"]
+        lines << [type[:name], type[:path]]
       end
 
-      puts 'Available types:'
-      puts
       lines.sort_by { |line| line[0] }.each do |line|
         printf("%-#{col1size}s\t%s\n", line[0], line[1])
       end

data/lib/forgitter/version.rb

@@ -1,3 +1,3 @@
 module Forgitter
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forgitter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Adam Dunson