sysadmin 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/doc/ChangeLog

@@ -1,3 +1,16 @@
+=== 0.1.3 / 2012-10-25
+
+* Add Class
+
+  * Sysadmin::Util
+
+* Pseudo-Keyword Arguments
+
+  * Sysadmin::FileExtensn
+
+* Uncontaminated loadpath
+
+
 === 0.1.2 / 2012-09-27
 
 * Add Methods

data/doc/README

@@ -39,6 +39,10 @@ Module
 Class
 =====
 
+- Sysadmin::Util
+
+  General methods.
+
 - Sysadmin::Directory
 
   Enumerable Dir class.
@@ -48,6 +52,11 @@ Class
 Method
 ======
 
+
+* Sysadmin::Util.create_multi_dimensional_hash
+
+  Return new Multi Dimensional Hash object.
+
 * File.zread (file)
 
   Referred by Sysadmin::FileHandler.

data/doc/README.ja

@@ -39,6 +39,10 @@ $ gem install sysadmin
 クラス
 ======
 
+- Sysadmin::Util
+
+  汎用的なメソッド
+
 - Sysadmin::Directory
 
   Enumerable な Dir クラス
@@ -48,6 +52,10 @@ $ gem install sysadmin
 メソッド
 ========
 
+* Sysadmin::Util.create_multi_dimensional_hash
+
+  多次元ハッシュを生成して返す
+
 * File.zread(file)
 
   Sysadmin::FileHandler を呼ぶと追加される

data/lib/sysadmin.rb

@@ -2,20 +2,15 @@
 # Name::      Sysadmin
 # Author::    774 <http://id774.net>
 # Created::   Mar 23, 2012
-# Updated::   Sep  6, 2012
+# Updated::   Sep 27, 2012
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Sysadmin
-  VERSION = "0.1.2"
-  USER_DIR = "/."
-  ROOT_DIR = File.expand_path("..", File.dirname(__FILE__))
-  $:.unshift ROOT_DIR
-  $:.unshift ROOT_DIR + '/lib'
-  $:.unshift ROOT_DIR + '/lib/sysadmin'
-
-  require 'file_ext'
-  require 'dir_ext'
-  require 'directory'
-  require 'time_ext'
+  VERSION = "0.1.3"
+  require File.dirname(__FILE__) +  "/sysadmin/util"
+  require File.dirname(__FILE__) +  "/sysadmin/file_ext"
+  require File.dirname(__FILE__) +  "/sysadmin/dir_ext"
+  require File.dirname(__FILE__) +  "/sysadmin/directory"
+  require File.dirname(__FILE__) +  "/sysadmin/time_ext"
 end

data/lib/sysadmin/file_ext.rb

@@ -25,30 +25,30 @@ module Sysadmin
       end
     end
 
-    def File.append_line(file, str)
-      if File.exist?(file)
-        f = open(file, 'a')
+    def File.append_line(params)
+      if File.exist?(params[:file])
+        f = open(params[:file], 'a')
       else
-        f = open(file, 'w')
+        f = open(params[:file], 'w')
       end
-      f << str
+      f << params[:str]
       f << "\n"
       f.close
     end
 
-    def File.new_line(file, str)
-      f = open(file, 'w')
-      f << str
+    def File.new_line(params)
+      f = open(params[:file], 'w')
+      f << params[:str]
       f << "\n"
       f.close
     end
 
-    def File.replace_line(file, src, out)
-      open(file, "r+") { |f|
+    def File.replace_line(params)
+      open(params[:file], "r+") { |f|
         f.rewind
         body = f.read
-        body = body.gsub(src) { |tmp|
-          out
+        body = body.gsub(params[:src]) { |tmp|
+          params[:dst]
         }
         f.rewind
         f.puts body
@@ -56,12 +56,12 @@ module Sysadmin
       }
     end
 
-    def File.remove_line(file, str)
+    def File.remove_line(params)
       out = ""
-      IO.foreach(file) { |line|
-        out << line unless line.include?(str)
+      IO.foreach(params[:file]) { |line|
+        out << line unless line.include?(params[:str])
       }
-      open(file, "w") { |f|
+      open(params[:file], "w") { |f|
         f.write out
       }
     end

data/lib/sysadmin/time_ext.rb

@@ -5,7 +5,7 @@
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
-require "time"
+require 'time'
 
 module Sysadmin
   module TimeExtension

data/lib/sysadmin/util.rb

@@ -0,0 +1,16 @@
+# Name::      Sysadmin::Util
+# Author::    774 <http://id774.net>
+# Created::   Oct 25, 2012
+# Updated::   Jul 25, 2012
+# Copyright:: 774 Copyright (c) 2012
+# License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
+module Sysadmin
+  class Util
+    class << self
+      def create_multi_dimensional_hash
+        Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
+      end
+    end
+  end
+end

data/spec/lib/sysadmin/dir_ext_spec.rb

@@ -6,14 +6,14 @@ describe Sysadmin::DirExtension, 'Dir クラス拡張' do
   context 'で filelist メソッドを呼ぶ場合' do
     describe 'ディレクトリ名を指定すると' do
       it "ディレクトリ内のファイル一覧が返却される" do
-        test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
+        test_dir = File.expand_path("../../test_dir/a", File.dirname(__FILE__))
         Dir.filelist(test_dir).should have(2).items
       end
     end
 
     describe 'ファイル名を指定すると' do
       it "ファイル名が返却される" do
-        test_dir = File.expand_path("../../test_dir/file2", File.dirname(__FILE__))
+        test_dir = File.expand_path("../../test_dir/a/d.txt", File.dirname(__FILE__))
         Dir.filelist(test_dir).should have(1).items
       end
     end
@@ -21,20 +21,20 @@ describe Sysadmin::DirExtension, 'Dir クラス拡張' do
     describe 'サブディレクトリを true にしてディレクトリを指定すると' do
       it "サブディレクトリ内のファイルも返却される" do
         test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
-        Dir.filelist(test_dir, sub_directory = true).should have(6).items
+        Dir.filelist(test_dir, sub_directory = true).should have(9).items
       end
     end
 
     describe 'サブディレクトリを false にしてディレクトリを指定すると' do
       it "ディレクトリ内のファイル一覧が返却される (サブディレクトリは見ない)" do
-        test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
+        test_dir = File.expand_path("../../test_dir/a", File.dirname(__FILE__))
         Dir.filelist(test_dir, sub_directory = false).should have(2).items
       end
     end
 
     describe 'サブディレクトリを true にしてファイル名を指定しても' do
       it "ファイル名が返却される (サブディレクトリは見ない)" do
-        test_dir = File.expand_path("../../test_dir/file2", File.dirname(__FILE__))
+        test_dir = File.expand_path("../../test_dir/a/d.txt", File.dirname(__FILE__))
         Dir.filelist(test_dir).should have(1).items
       end
     end

data/spec/lib/sysadmin/directory_spec.rb

@@ -7,49 +7,49 @@ describe Sysadmin::Directory, 'Directory クラス' do
     describe 'ディレクトリ名を指定すると' do
       it "ディレクトリ内のファイル一覧が返却される" do
         test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(7).items
+        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(9).items
       end
     end
 
     describe 'ディレクトリ名を指定すると' do
       it "ディレクトリ内のファイル一覧が返却される" do
-        test_dir = File.expand_path("../../test_dir/dir2", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(2).items
+        test_dir = File.expand_path("../../test_dir/a", File.dirname(__FILE__))
+        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(4).items
       end
     end
 
     describe 'ディレクトリ名を指定すると' do
       it "ディレクトリ内のファイル一覧が返却される" do
-        test_dir = File.expand_path("../../test_dir/dir3", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(1).item
+        test_dir = File.expand_path("../../test_dir/a/g", File.dirname(__FILE__))
+        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(2).item
       end
     end
 
     describe 'ディレクトリ名を指定すると' do
       it "ディレクトリ内のファイル一覧が返却される" do
-        test_dir = File.expand_path("../../test_dir/dir6", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(1).item
+        test_dir = File.expand_path("../../test_dir/b", File.dirname(__FILE__))
+        Sysadmin::Directory.new(test_dir).map{|f|f}.should have(2).item
       end
     end
 
     describe 'ディレクトリ名を指定し grep すると' do
       it "ディレクトリ内の grep に適合したファイル一覧が返却される" do
         test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).grep(/\.file7$/).should have(1).item
+        Sysadmin::Directory.new(test_dir).grep(/\.txt/).should have(9).item
       end
     end
 
     describe 'ディレクトリ名を指定し grep すると' do
       it "ディレクトリ内の grep に適合したファイル一覧が返却される" do
         test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).grep(/\.file/).should have(3).items
+        Sysadmin::Directory.new(test_dir).grep(/d\.txt/).should have(1).items
       end
     end
 
     describe 'ディレクトリ名を指定し grep して take すると' do
       it "ディレクトリ内の grep に適合し take した数だけファイル一覧が返却される" do
         test_dir = File.expand_path("../../test_dir", File.dirname(__FILE__))
-        Sysadmin::Directory.new(test_dir).grep(/\.file/).take(2).should have(2).items
+        Sysadmin::Directory.new(test_dir).grep(/\.txt/).take(3).should have(3).items
       end
     end
 

data/spec/lib/sysadmin/file_ext_spec.rb

@@ -10,7 +10,7 @@ describe Sysadmin::FileExtension, 'File クラス拡張' do
       try = "uncompressed"
       expect = "uncompressed\n"
       @uncompressed = Tempfile::new("test.txt")
-      File.append_line(@uncompressed.path, try)
+      File.append_line(:file => @uncompressed.path, :str => try)
 
       File.zread(@uncompressed.path).should == expect
       @uncompressed.close
@@ -38,7 +38,7 @@ describe Sysadmin::FileExtension, 'File クラス拡張' do
       expect   = "hoge\n"
 
       3.times do
-        File.append_line(@testfile.path, src)
+        File.append_line(:file => @testfile.path, :str => src)
       end
 
       open(@testfile.path) { |file|
@@ -58,9 +58,9 @@ describe Sysadmin::FileExtension, 'File クラス拡張' do
       expect   = "fuga\n"
 
       3.times do
-        File.append_line(@testfile.path, src)
+        File.append_line(:file => @testfile.path, :str => src)
       end
-      File.replace_line(@testfile.path, src, try)
+      File.replace_line(:file => @testfile.path, :src => src, :dst => try)
 
       open(@testfile.path) { |file|
         while line = file.gets
@@ -80,13 +80,13 @@ describe Sysadmin::FileExtension, 'File クラス拡張' do
       expect   = "fuga\n"
 
       3.times do
-        File.append_line(@testfile.path, src)
+        File.append_line(:file => @testfile.path, :str => src)
       end
-      File.replace_line(@testfile.path, src, replace)
+      File.replace_line(:file => @testfile.path, :src => src, :dst => replace)
       2.times do
-        File.append_line(@testfile.path, src)
+        File.append_line(:file => @testfile.path, :str => src)
       end
-      File.remove_line(@testfile.path, erase)
+      File.remove_line(:file => @testfile.path, :str => erase)
 
       open(@testfile.path) { |file|
         while line = file.gets
@@ -104,8 +104,8 @@ describe Sysadmin::FileExtension, 'File クラス拡張' do
       second   = 'second'
       expect   = "second\n"
 
-      File.new_line(@testfile.path, init)
-      File.new_line(@testfile.path, second)
+      File.new_line(:file => @testfile.path, :str => init)
+      File.new_line(:file => @testfile.path, :str => second)
 
       open(@testfile.path) { |file|
         while line = file.gets

data/spec/lib/sysadmin/util_spec.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sysadmin::Util do
+  context 'で multi_dimensional_hash メソッドを呼ぶ場合' do
+    describe '引数を付けずに呼ぶと' do
+      it "多次元ハッシュが返る" do
+        h = Sysadmin::Util.create_multi_dimensional_hash
+        h["a"]["b"]["c"]["d"] = 10
+        h["a"]["b"]["c"]["e"] = 15
+        h["a"]["b"]["c"]["d"].should == 10
+        h["a"]["b"]["c"]["e"].should == 15
+      end
+    end
+  end
+end

data/spec/lib/sysadmin_spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Sysadmin, 'sysadmin' do
   context 'のバージョンを参照した場合' do
     it "バージョンが正しく表示される" do
-      expect = '0.1.2'
+      expect = '0.1.3'
       Sysadmin.const_get(:VERSION).should be_true
       Sysadmin.const_get(:VERSION).should == expect
     end

data/spec/test_dir/a/d.txt

@@ -0,0 +1 @@
+d

data/spec/test_dir/a/g/h.txt

@@ -0,0 +1 @@
+h

data/spec/test_dir/a/g/m/n.txt

@@ -0,0 +1 @@
+n

data/spec/test_dir/a/o.txt

@@ -0,0 +1 @@
+o

data/spec/test_dir/b/e.txt

@@ -0,0 +1 @@
+e

data/spec/test_dir/b/i/j.txt

@@ -0,0 +1 @@
+j

data/spec/test_dir/c/f.txt

@@ -0,0 +1 @@
+f

data/spec/test_dir/c/k/l.txt

@@ -0,0 +1 @@
+l

data/spec/test_dir/p.txt

@@ -0,0 +1 @@
+p

data/sysadmin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sysadmin"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2012-09-27"
+  s.date = "2012-10-25"
   s.description = "System Administration General Library"
   s.email = "idnanashi@gmail.com"
   s.extra_rdoc_files = [
@@ -32,21 +32,25 @@ Gem::Specification.new do |s|
     "lib/sysadmin/directory.rb",
     "lib/sysadmin/file_ext.rb",
     "lib/sysadmin/time_ext.rb",
+    "lib/sysadmin/util.rb",
     "script/.gitkeep",
     "script/build",
     "spec/lib/sysadmin/dir_ext_spec.rb",
     "spec/lib/sysadmin/directory_spec.rb",
     "spec/lib/sysadmin/file_ext_spec.rb",
     "spec/lib/sysadmin/time_ext_spec.rb",
+    "spec/lib/sysadmin/util_spec.rb",
     "spec/lib/sysadmin_spec.rb",
     "spec/spec_helper.rb",
-    "spec/test_dir/.dir1/.file6",
-    "spec/test_dir/.file1",
-    "spec/test_dir/dir2/dir4/file4",
-    "spec/test_dir/dir2/file3",
-    "spec/test_dir/dir3/file5",
-    "spec/test_dir/dir6/dir7/.file7",
-    "spec/test_dir/file2",
+    "spec/test_dir/a/d.txt",
+    "spec/test_dir/a/g/h.txt",
+    "spec/test_dir/a/g/m/n.txt",
+    "spec/test_dir/a/o.txt",
+    "spec/test_dir/b/e.txt",
+    "spec/test_dir/b/i/j.txt",
+    "spec/test_dir/c/f.txt",
+    "spec/test_dir/c/k/l.txt",
+    "spec/test_dir/p.txt",
     "sysadmin.gemspec",
     "vendor/.gitkeep"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sysadmin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -82,21 +82,25 @@ files:
 - lib/sysadmin/directory.rb
 - lib/sysadmin/file_ext.rb
 - lib/sysadmin/time_ext.rb
+- lib/sysadmin/util.rb
 - script/.gitkeep
 - script/build
 - spec/lib/sysadmin/dir_ext_spec.rb
 - spec/lib/sysadmin/directory_spec.rb
 - spec/lib/sysadmin/file_ext_spec.rb
 - spec/lib/sysadmin/time_ext_spec.rb
+- spec/lib/sysadmin/util_spec.rb
 - spec/lib/sysadmin_spec.rb
 - spec/spec_helper.rb
-- spec/test_dir/.dir1/.file6
-- spec/test_dir/.file1
-- spec/test_dir/dir2/dir4/file4
-- spec/test_dir/dir2/file3
-- spec/test_dir/dir3/file5
-- spec/test_dir/dir6/dir7/.file7
-- spec/test_dir/file2
+- spec/test_dir/a/d.txt
+- spec/test_dir/a/g/h.txt
+- spec/test_dir/a/g/m/n.txt
+- spec/test_dir/a/o.txt
+- spec/test_dir/b/e.txt
+- spec/test_dir/b/i/j.txt
+- spec/test_dir/c/f.txt
+- spec/test_dir/c/k/l.txt
+- spec/test_dir/p.txt
 - sysadmin.gemspec
 - vendor/.gitkeep
 homepage: http://github.com/id774/sysadmin