diffall 0.0.1 → 0.0.2

data/CHANGES

@@ -1,6 +1,14 @@
 = diffall Changelog
 
-== Master (for 0.0.1)
+== Master (for 0.0.3)
+
+== Version 0.0.2
+* Add --recurve option to bin/diffall.
+* Modify --filename-only not to contain indent at the beginning of line.
+* Obsolete file size checking function.
+* Add DiffAll class as backend.
+
+== Version 0.0.1
 * Modify bin/diffall to show only multiplicated files.
 * Add --filename-only option to bin/diffall.
 * Add --last-hide option to bin/diffall.

data/Gemfile

@@ -6,9 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.10.0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.3"
-  gem "jeweler", "~> 1.8.3"
+  gem "bundler", "~> 1.2.2"
+  gem "jeweler", "~> 1.8.4"
   gem "simplecov", ">= 0"
+  gem "builtinextension", ">= 0.0.4"
+  gem "psych", ">= 0"
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 ippei94da
+Copyright (c) 2013 ippei94da
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -14,6 +14,6 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2012 ippei94da. See LICENSE.txt for
+Copyright (c) 2013 ippei94da. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -25,18 +25,22 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
 
-task :default => :spec
+task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/diffall

@@ -1,64 +1,41 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-#HASH_COMMAND = 'sha256sum'
-HASH_COMMAND = 'md5sum'
-
 require "pp"
 require "optparse"
-#require "digest/sha1"
-#require "digest/sha2"
 require "rubygems"
-gem "builtinextension"
+#gem "builtinextension"
 require "string_escape_zsh.rb"
-#/home/ippei/devel/builtinextension/lib/
-
-def show_groups(hash)
-  hash.each do |key, files|
-    next if files.size < 2
-    unless OPTIONS[:filename]
-      puts
-      puts key
-    end
-    num = files.size
-    num = num - 1 if OPTIONS[:last_hide]
-    num.times do |i|
-      puts "  " + files[i]
-    end
-  end
-end
+require "diffall"
 
 ## option analysis
 OPTIONS = {}
 op = OptionParser.new
-op.on("-s"    , "--size"    , "Check size."){OPTIONS[:size] = true}
-op.on("-h"    , "--hash", "Check size and hash(default)."){OPTIONS[:hash] = true}
-op.on("-f"    , "--filename-only", "Show filename only, no hash value."){OPTIONS[:filename] = true}
+op.on("-f"    , "--filename-only", "Show filename only, no hash value, no indent."){OPTIONS[:filename] = true}
 op.on("-l"    , "--last-hide", "Not show last filename among the same hash value."){OPTIONS[:last_hide] = true}
-
-#op.on("-d"    , "--diff"    , "Check size, checksum and diff command."){OPTIONS[:size] = true}
+op.on("-r"    , "--recursive", "Recursive indication for directory."){OPTIONS[:recursive] = true}
 op.parse!(ARGV)
 
-size_groups = {}
-ARGV.each do |file|
-  size_groups[File.size(file)] ||= []
-  size_groups[File.size(file)] << file
-end
-if OPTIONS[:size]
-  show_groups(size_groups)
-  exit
-end
-
-hash_groups = {}
-size_groups.each do |size, files|
-  #next if files.size < 2
-  files.each do |file|
-    #puts file
-    command = "#{HASH_COMMAND} #{file.escape_zsh}"
-    hash = `#{command}`.sub("  #{file}", '')
-    #hash = Digest::SHA256.hexdigest(File.open(file, "rb").read)
-    hash_groups[hash] ||= []
-    hash_groups[hash] << file
+if ARGV.size == 0
+  #stdin mode
+  da = DiffAll.read_io($stdin)
+else
+  if OPTIONS[:recursive]
+    files = []
+    ARGV.each do |file|
+      if File.directory? file
+        files << Dir.glob("#{file}/**/*")
+      else
+        files << file
+      end
+    end
+  else
+    files = ARGV
   end
+  files.flatten!
+  files.delete_if {|file| File.directory? file }
+
+  da = DiffAll.new(files)
 end
-show_groups(hash_groups)
+
+da.show(OPTIONS)

data/diffall.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "diffall"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2012-08-30"
+  s.date = "2013-02-07"
   s.description = "Checking process is composed of two steps; file size and checksum hash. Not using diff command. User can stop the first step by indicationg an option."
   s.email = "ippei94da@gmail.com"
   s.executables = ["diffall"]
@@ -31,46 +31,51 @@ Gem::Specification.new do |s|
     "bin/diffall",
     "diffall.gemspec",
     "lib/diffall.rb",
-    "spec/diffall_spec.rb",
-    "spec/files/12_a",
-    "spec/files/1_a",
-    "spec/files/1_b",
-    "spec/files/23_a",
-    "spec/files/2_a",
-    "spec/files/2_b",
-    "spec/files/empty_a",
-    "spec/files/empty_b",
-    "spec/files/empty_c",
-    "spec/spec_helper.rb"
+    "test/files/12_a",
+    "test/files/1_a",
+    "test/files/1_b",
+    "test/files/23_a",
+    "test/files/2_a",
+    "test/files/2_b",
+    "test/files/dir/empty_a",
+    "test/files/dir/empty_b",
+    "test/files/empty_a",
+    "test/files/empty_b",
+    "test/files/empty_c",
+    "test/helper.rb",
+    "test/test_diffall.rb"
   ]
   s.homepage = "http://github.com/ippei94da/diffall"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "This gem provides a command to check identical files among many files."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<builtinextension>, [">= 0.0.4"])
+      s.add_development_dependency(%q<psych>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<builtinextension>, [">= 0.0.4"])
+      s.add_dependency(%q<psych>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<builtinextension>, [">= 0.0.4"])
+    s.add_dependency(%q<psych>, [">= 0"])
   end
 end
 

data/lib/diffall.rb

@@ -0,0 +1,75 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "rubygems"
+gem "builtinextension"
+require "string_escape_zsh.rb"
+
+#
+#
+#
+class DiffAll
+  HASH_COMMAND = 'sha256sum'
+
+  attr_reader :hashtags
+
+  #
+  def initialize(files = [])
+    @hashtags = {}
+    files.each do |file|
+      command = "#{HASH_COMMAND} #{file.escape_zsh}"
+      str = `#{command}` #.sub("  #{file}", '')
+      add str
+      #hash_groups[hash] ||= []
+      #hash_groups[hash] << file
+    end
+  end
+
+  #
+  def self.read_io(io)
+    result = self.new
+    #io.readlines.each do |line|
+    io.each_line do |line|
+      result.add line
+    end
+    result
+  end
+
+  #Add {filename => hashtag } to @hashtags.
+  #E.g.,
+  # "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865  file1"
+
+  def show(options, io = $stdout)
+    #pp @hashtags
+    hashtag_files = {}
+    @hashtags.each do |file, hashtag|
+      hashtag_files[hashtag] ||= []
+      hashtag_files[hashtag] << file
+    end
+
+    hashtag_files.keys.sort.each do |hashtag|
+      files = hashtag_files[hashtag]
+      next if files.size < 2
+      unless options[:filename]
+        io.puts hashtag
+      end
+      num = files.size
+      num = num - 1 if options[:last_hide]
+      num.times do |i|
+        indent = "  "
+        indent = "" if options[:filename]
+        io.puts indent + files[i]
+      end
+    end
+  end
+
+  #private
+  def add(str)
+    str.chomp!
+    hashtag  = str[0..63]
+    filename = str[66..-1]
+    @hashtags[filename] = hashtag
+  end
+
+end
+

data/test/helper.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'diffall'
+
+class Test::Unit::TestCase
+end

data/test/test_diffall.rb

@@ -0,0 +1,112 @@
+require 'helper'
+require 'pp'
+require 'stringio'
+
+#class DiffAll
+#  public :add
+#end
+
+class TestDiffall < Test::Unit::TestCase
+
+  def setup
+    @da00 = DiffAll.new
+
+    @da01 = DiffAll.new(["test/files/12_a", "test/files/1_a", "test/files/1_b"])
+  end
+
+  def test_initialize
+    da00 = DiffAll.new
+    assert_equal({}, da00.hashtags)
+
+    da01 = DiffAll.new(["test/files/12_a", "test/files/1_a", "test/files/1_b"])
+    corrects = {
+      "test/files/12_a" =>
+        "a1fb50e6c86fae1679ef3351296fd6713411a08cf8dd1790a4fd05fae8688164",
+      "test/files/1_a" =>
+        "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865",
+      "test/files/1_b" =>
+        "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865",
+    }
+    assert_equal(corrects, da01.hashtags)
+  end
+
+  def test_self_read_io
+    io = StringIO.new
+    io.puts "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865  test/files/1_a"
+    io.puts "a1fb50e6c86fae1679ef3351296fd6713411a08cf8dd1790a4fd05fae8688164  test/files/12_a"
+    io.rewind
+    da02 = DiffAll.read_io io
+  end
+
+  def test_add
+    #pp @da00.class
+    @da00.add "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865  test/files/1_a"
+    @da00.add "a1fb50e6c86fae1679ef3351296fd6713411a08cf8dd1790a4fd05fae8688164  test/files/12_a"
+    corrects = {
+      "test/files/1_a" =>
+        "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865",
+      "test/files/12_a" =>
+        "a1fb50e6c86fae1679ef3351296fd6713411a08cf8dd1790a4fd05fae8688164",
+    }
+    assert_equal(corrects, @da00.hashtags)
+  end
+
+  def test_show
+    options = {
+      :filename => false,
+      :last_hide => false,
+    }
+    io = StringIO.new
+    @da01.show(options, io)
+    io.rewind
+    results = io.readlines
+    corrects = [
+      "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865\n",
+      "  test/files/1_a\n",
+      "  test/files/1_b\n",
+    ]
+    assert_equal(corrects, results)
+
+    options = {
+      :filename  => true,
+      :last_hide => false,
+    }
+    io = StringIO.new
+    @da01.show(options, io)
+    io.rewind
+    results = io.readlines
+    corrects = [
+      "test/files/1_a\n",
+      "test/files/1_b\n",
+    ]
+    assert_equal(corrects, results)
+
+    options = {
+      :filename  => false,
+      :last_hide => true,
+    }
+    io = StringIO.new
+    @da01.show(options, io)
+    io.rewind
+    results = io.readlines
+    corrects = [
+      "4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865\n",
+      "  test/files/1_a\n",
+    ]
+    assert_equal(corrects, results)
+
+    options = {
+      :filename  => true,
+      :last_hide => true,
+    }
+    io = StringIO.new
+    @da01.show(options, io)
+    io.rewind
+    results = io.readlines
+    corrects = [
+      "test/files/1_a\n",
+    ]
+    assert_equal(corrects, results)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffall
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &77447700 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77447700
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &77190030 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: *77190030
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77189200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: *77189200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77188730 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77188730
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77188200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +69,44 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77188200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builtinextension
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Checking process is composed of two steps; file size and checksum hash.
   Not using diff command. User can stop the first step by indicationg an option.
 email: ippei94da@gmail.com
@@ -89,17 +130,19 @@ files:
 - bin/diffall
 - diffall.gemspec
 - lib/diffall.rb
-- spec/diffall_spec.rb
-- spec/files/12_a
-- spec/files/1_a
-- spec/files/1_b
-- spec/files/23_a
-- spec/files/2_a
-- spec/files/2_b
-- spec/files/empty_a
-- spec/files/empty_b
-- spec/files/empty_c
-- spec/spec_helper.rb
+- test/files/12_a
+- test/files/1_a
+- test/files/1_b
+- test/files/23_a
+- test/files/2_a
+- test/files/2_b
+- test/files/dir/empty_a
+- test/files/dir/empty_b
+- test/files/empty_a
+- test/files/empty_b
+- test/files/empty_c
+- test/helper.rb
+- test/test_diffall.rb
 homepage: http://github.com/ippei94da/diffall
 licenses:
 - MIT
@@ -115,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -765282927
+      hash: 310516577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem provides a command to check identical files among many files.

data/spec/diffall_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Diffall" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'diffall'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end