filecount 0.1.1 → 0.2.0

data/bin/filecount

@@ -1,13 +1,4 @@
 #!/usr/bin/env ruby
 require 'filecount'
 
-if ARGV[0] != nil then 
-  dir = ARGV[0]
-else
-  dir = "."
-end
-
-fc = Filecount.new
-fc.run(dir)
-
-puts "#{fc.filecount} file(s) found"
+Filecount::Runner.execute

data/lib/filecount/counter.rb

@@ -0,0 +1,51 @@
+module Filecount
+  class Counter
+    
+    def initialize(options)
+      @options = options
+      @count = 0
+      @start_dir
+    end
+
+    def self.execute(options)
+      new(options).execute
+    end
+    
+    def execute()
+      if ARGV[0] != nil and File.directory?(ARGV[0])
+        count(ARGV[0])
+      elsif ARGV[0] != nil
+        puts "Directory '#{ARGV[0]}' not found"
+        exit
+      else
+        count(".")
+      end
+      @count
+    end
+    
+    def count (directory)
+      Dir.foreach(directory) do |file|
+        if file != '.' && file != '..' then
+          if @options[:dotfiles] == nil && file[0].chr == "." && file != '.git'
+            next
+          end
+          f = "#{directory}/#{file}"
+
+          if File.directory?(f)
+            if @options[:count_git_dir] == nil && file == '.git' 
+              next
+            end
+            count(f)
+          else
+            if @options[:verbose]
+              puts f
+            end
+            @count += 1
+          end
+        end
+      end
+    end
+
+
+  end
+end

data/lib/filecount/runner.rb

@@ -0,0 +1,49 @@
+require 'optparse'
+module Filecount
+  class Runner
+    def initialize
+      @options = {}
+      parse_options
+    end
+
+    def self.execute
+      new().execute
+    end
+
+    def execute
+      count = Counter.execute(@options)
+      puts "-- #{count} files found"
+    end
+    
+    def parse_options
+      optparse = OptionParser.new do |opts|
+        opts.banner = 'Usage: filecount [options] directory'
+        
+        opts.on('-d', '--dotfiles', 'Follow dotfiles and directories') do
+          @options[:dotfiles] = true
+        end
+        
+        opts.on('-g', '--count-git-dir', 'Count files in git directory') do
+          @options[:count_git_dir] = true
+        end
+        
+        opts.on('-v', '--verbose', 'Display counted files') do
+          @options[:verbose] = true
+        end
+        
+        opts.on('-h', '--help', 'Display this screen') do
+          puts opts
+          exit
+        end
+      end
+      
+      begin 
+        optparse.parse! 
+      rescue 
+        puts "Invalid options"
+        puts optparse
+        exit
+      end
+    end
+  end
+end

data/lib/filecount.rb

@@ -1,19 +1,3 @@
-class Filecount
-  attr_reader :filecount
-  def initialize
-    @filecount = 0
-  end
+require 'filecount/runner'
+require 'filecount/counter'
 
-  def run (directory)
-    Dir.foreach(directory) do |file|
-      if file != '.' && file != '..' then
-        f = "#{directory}/#{file}"
-        if File.directory?(f)
-          run(f)
-        else
-          @filecount += 1
-        end
-      end
-    end
-  end
-end

data/lib/run.rb

@@ -0,0 +1,3 @@
+require 'filecount'
+
+Filecount::Runner.execute

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: filecount
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Markus Nilsson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +02:00
+date: 2010-07-30 00:00:00 +02:00
 default_executable: filecount
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/filecount.rb
+- lib/filecount/args.rb
+- lib/filecount/counter.rb
+- lib/filecount/runner.rb
+- lib/run.rb
 - LICENSE
 - README.rdoc
 - test/helper.rb