milkode 0.1.4 → 0.1.5

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.5 2011/08/02
+
+* Compatibility Ruby 1.9.2p290.
+
 === 0.1.4 2011/08/01
 
 * To act reasonably even if it fails to require 'readline'.

data/Rakefile

@@ -30,6 +30,8 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'coderay', '>=0.9.8'
   gem.add_runtime_dependency 'thin', '>=1.2.10'
   gem.add_runtime_dependency 'archive-zip', '>=0.3.0'
+  gem.add_runtime_dependency 'haml', '>=3.1.2'
+  gem.add_runtime_dependency 'sass', '>=3.1.3'
 
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
@@ -39,6 +41,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 
 # groonga関連のテストが通らないため、独自のrake_test_loaderを読み込む
+$LOAD_PATH.unshift '.'
 module Rake
   class TestTask < TaskLib
     def rake_loader # :nodoc:

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cdstk/cli_cdstk'
 
-Version = "0.1.4"
+Version = "0.1.5"
 Milkode::CLI_Cdstk.execute(STDOUT, ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -194,7 +194,7 @@ module Milkode
             alert("rm_package", package)
             @package_count += 1
             
-            Database.instance.remove(package) do |record|
+            Database.instance.remove([package]) do |record|
               alert("rm_record", record.path)
               @file_count += 1
             end
@@ -447,7 +447,7 @@ module Milkode
         # 実際に使うタイミングでファイルの内容を読み込み
         # values[:content] = open(filename).read
         # データベース内の文字コードは'utf-8'で統一
-        values[:content] = File.read(filename).kconv(Kconv::UTF8)
+        values[:content] = Kconv.kconv(File.read(filename), Kconv::UTF8)
         
         # データベースに格納
         values.each do |key, value|

data/lib/milkode/cdweb/app.rb

@@ -18,7 +18,7 @@ require 'milkode/cdweb/lib/mkurl'
 set :haml, :format => :html5
 
 get '/' do
-  @version = "0.1.4"
+  @version = "0.1.5"
   @package_num = Database.instance.fileList('').size
   @file_num = Database.instance.fileNum
   haml :index

data/lib/milkode/cdweb/lib/coderay_wrapper.rb

@@ -22,9 +22,9 @@ module Milkode
     end
 
     def set_range(range)
-      content_a = @content.to_a
+      content_a = @content.split("\n")
       range = limit_range(range, content_a)
-      @content = content_a[range]
+      @content = content_a[range].join("\n")
       @line_number_start = range.first + 1
     end
 

data/lib/milkode/cdweb/lib/command.rb

@@ -55,7 +55,7 @@ module Milkode
     @total_records = fileList.size
     @record_content = fileList.map do |v|
       "<dt class='result-file'>#{file_or_dirimg(v[1])}<a href='#{Mkurl.new('/home/' + v[0], params).inherit_query_shead}'>#{File.basename v[0]}</a></dt>"
-    end
+    end.join
     @elapsed = Time.now - before
     haml :filelist
   end

data/lib/milkode/common/util.rb

@@ -58,7 +58,7 @@ module Gren
       t = t % 3600
       m = t / 60
       t = t % 60
-      t += round(time - time.prec_i, 2)
+      t += round(time - time.to_i, 2)
       
       if (h > 0 && m > 0)
         "#{h}h #{m}m #{t}s"
@@ -82,13 +82,13 @@ module Gren
       kb = 1024
 
       if (size >= tb)
-        round(size / tb.prec_f, 2).to_s + "TB"
+        round(size / tb.to_f, 2).to_s + "TB"
       elsif (size >= gb)
-        round(size / gb.prec_f, 2).to_s + "GB"
+        round(size / gb.to_f, 2).to_s + "GB"
       elsif (size >= mb)
-        round(size / mb.prec_f, 2).to_s + "MB"
+        round(size / mb.to_f, 2).to_s + "MB"
       elsif (size >= kb)
-        round(size / kb.prec_f, 2).to_s + "KB"
+        round(size / kb.to_f, 2).to_s + "KB"
       else
         size.to_s + "Byte"
       end

data/milkode.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["ongaeshi"]
+  s.authors = [%q{ongaeshi}]
   s.date = %q{2011-08-01}
   s.description = %q{Line based local source code search engine & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
-  s.executables = ["cdv", "milk", "cdview"]
+  s.executables = [%q{cdv}, %q{cdview}, %q{milk}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -88,35 +88,15 @@ Gem::Specification.new do |s|
     "test/test_util.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/milkode}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Line based local source code search engine & web-app.}
-  s.test_files = [
-    "test/file_assert.rb",
-    "test/file_test_utils.rb",
-    "test/rake_test_loader.rb",
-    "test/runner.rb",
-    "test/test_bin_exec.rb",
-    "test/test_cdstk.rb",
-    "test/test_cdstk_yaml.rb",
-    "test/test_coderay_wrapper.rb",
-    "test/test_coderay_wrapper_data.rb",
-    "test/test_database.rb",
-    "test/test_dbdir.rb",
-    "test/test_gren_util.rb",
-    "test/test_helper.rb",
-    "test/test_mkurl.rb",
-    "test/test_query.rb",
-    "test/test_string_snip.rb",
-    "test/test_util.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -128,6 +108,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
       s.add_runtime_dependency(%q<thin>, [">= 1.2.10"])
       s.add_runtime_dependency(%q<archive-zip>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.2"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1.3"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -140,6 +122,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<coderay>, [">= 0.9.8"])
       s.add_dependency(%q<thin>, [">= 1.2.10"])
       s.add_dependency(%q<archive-zip>, [">= 0.3.0"])
+      s.add_dependency(%q<haml>, [">= 3.1.2"])
+      s.add_dependency(%q<sass>, [">= 3.1.3"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -153,6 +137,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coderay>, [">= 0.9.8"])
     s.add_dependency(%q<thin>, [">= 1.2.10"])
     s.add_dependency(%q<archive-zip>, [">= 0.3.0"])
+    s.add_dependency(%q<haml>, [">= 3.1.2"])
+    s.add_dependency(%q<sass>, [">= 3.1.3"])
   end
 end
 

data/test/file_assert.rb

@@ -27,8 +27,8 @@ def assert_diff_files(file1, file2)
 end
 
 def assert_lines(s1, s2)
-  a1 = s1.to_a
-  a2 = s2.to_a
+  a1 = s1.split("\n")
+  a2 = s2.split("\n")
   
   a1.each_index do |i|
     assert_equal a1[i], a2[i]

data/test/test_cdstk_yaml.rb

@@ -51,13 +51,9 @@ class TestCdstkYaml < Test::Unit::TestCase
 
     # save
     yaml.save
-    assert_equal <<EOF, open('milkode.yaml').read
---- 
-version: 0.1
-contents: 
-- directory: dir1
-- directory: dir4
-EOF
+    r = YAML.load(open('milkode.yaml').read)
+    assert_equal 0.1, r['version']
+    assert_equal([{'directory'=>'dir1'}, {'directory' => 'dir4'}], r['contents'])
   end
 
   def test_001
@@ -66,12 +62,9 @@ EOF
     yaml.save
     
     # save
-    assert_equal <<EOF, open('otherpath/milkode.yaml').read
---- 
-version: 0.1
-contents: []
-
-EOF
+    r = YAML.load(open('otherpath/milkode.yaml').read)
+    assert_equal 0.1, r['version']
+    assert_equal([], r['contents'])
   end
 
   def test_query

data/test/test_database.rb

@@ -63,8 +63,8 @@ module Milkode
 
     def t_remove
       db = Database.instance
-      db.remove('test')
-      db.remove('lib')
+      db.remove(['test'])
+      db.remove(['lib'])
       assert_equal 0, db.totalRecords
     end
 

metadata

@@ -1,186 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: milkode
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-01 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2011-08-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156295840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  requirement: *id001
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: *2156295840
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2156294900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  name: jeweler
-  requirement: *id002
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  requirement: *id003
   prerelease: false
+  version_requirements: *2156294900
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2156293400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  name: termcolor
-  requirement: *id004
   prerelease: false
+  version_requirements: *2156293400
+- !ruby/object:Gem::Dependency
+  name: termcolor
+  requirement: &2156291660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: rroonga
-  requirement: *id005
   prerelease: false
+  version_requirements: *2156291660
+- !ruby/object:Gem::Dependency
+  name: rroonga
+  requirement: &2156290840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
-  name: rack
-  requirement: *id006
   prerelease: false
+  version_requirements: *2156290840
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2156281760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 6
-        version: 1.2.6
-  name: sinatra
-  requirement: *id007
   prerelease: false
+  version_requirements: *2156281760
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2156280900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 7
-        version: 0.3.7
-  name: launchy
-  requirement: *id008
   prerelease: false
+  version_requirements: *2156280900
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2156280140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.7
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  name: coderay
-  requirement: *id009
   prerelease: false
+  version_requirements: *2156280140
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &2156279380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 10
-        version: 1.2.10
-  name: thin
-  requirement: *id010
   prerelease: false
+  version_requirements: *2156279380
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &2156278300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.10
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+  prerelease: false
+  version_requirements: *2156278300
+- !ruby/object:Gem::Dependency
   name: archive-zip
-  requirement: *id011
+  requirement: &2156277200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156277200
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2156276000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
   prerelease: false
+  version_requirements: *2156276000
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &2156274960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
   type: :runtime
+  prerelease: false
+  version_requirements: *2156274960
 description: Line based local source code search engine & web-app.
 email: ongaeshi0621@gmail.com
-executables: 
+executables:
 - cdv
-- milk
 - cdview
+- milk
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -249,51 +233,29 @@ files:
 - test/test_query.rb
 - test/test_string_snip.rb
 - test/test_util.rb
-has_rdoc: true
 homepage: http://github.com/ongaeshi/milkode
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Line based local source code search engine & web-app.
-test_files: 
-- test/file_assert.rb
-- test/file_test_utils.rb
-- test/rake_test_loader.rb
-- test/runner.rb
-- test/test_bin_exec.rb
-- test/test_cdstk.rb
-- test/test_cdstk_yaml.rb
-- test/test_coderay_wrapper.rb
-- test/test_coderay_wrapper_data.rb
-- test/test_database.rb
-- test/test_dbdir.rb
-- test/test_gren_util.rb
-- test/test_helper.rb
-- test/test_mkurl.rb
-- test/test_query.rb
-- test/test_string_snip.rb
-- test/test_util.rb
+test_files: []