milkode 0.1.6 → 0.1.7

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.7 2011/08/04
+
+* archive-zip patch for Ruby1.9.2.
+
 === 0.1.6 2011/08/03
 
 * Bug fix, faild 'milk init' for Ubunts. (thanks kumonopanya, and maroekun)

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/milk

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

data/lib/milkode/cdweb/app.rb

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

data/lib/milkode/common/archive-zip.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief  archive-zipがRuby1.9.2に対応するまでのパッチ、readbytesが無ければ実装する
+# @author ongaeshi
+# @date   2011/08/04
+
+begin
+  require 'readbytes'
+rescue LoadError
+  # for Ruby 1.9.2
+  class TruncatedDataError<IOError
+    def initialize(mesg, data) # :nodoc:
+      @data = data
+      super(mesg)
+    end
+
+    # The read portion of an IO#readbytes attempt.
+    attr_reader :data
+  end
+  
+  class IO
+    # Reads exactly +n+ bytes.
+    #
+    # If the data read is nil an EOFError is raised.
+    #
+    # If the data read is too short a TruncatedDataError is raised and the read
+    # data is obtainable via its #data method.
+    def readbytes(n)
+      str = read(n)
+      if str == nil
+        raise EOFError, "End of file reached"
+      end
+      if str.size < n
+        raise TruncatedDataError.new("data truncated", str) 
+      end
+      str
+    end
+  end
+end
+
+require 'archive/zip'

data/lib/milkode/common/util.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'rubygems'
-require 'archive/zip'
+require 'milkode/common/archive-zip'
 require 'fileutils'
 
 module Milkode

data/milkode.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   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-03}
   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"
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/views/layout.haml",
     "lib/milkode/cdweb/views/search.haml",
     "lib/milkode/cdweb/views/view.haml",
+    "lib/milkode/common/archive-zip.rb",
     "lib/milkode/common/dbdir.rb",
     "lib/milkode/common/dir.rb",
     "lib/milkode/common/display_util.rb",
@@ -90,36 +91,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_dir.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"])

metadata

@@ -1,214 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: milkode
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.1.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-03 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2011-08-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2152344800 !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: *2152344800
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2152342800 !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: *2152342800
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2152341300 !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: *2152341300
+- !ruby/object:Gem::Dependency
+  name: termcolor
+  requirement: &2152339920 !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: *2152339920
+- !ruby/object:Gem::Dependency
+  name: rroonga
+  requirement: &2152338240 !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: *2152338240
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2152335820 !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: *2152335820
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2152333760 !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: *2152333760
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2152331640 !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: *2152331640
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &2152329700 !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: *2152329700
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &2152328500 !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
-  name: archive-zip
-  requirement: *id011
   prerelease: false
+  version_requirements: *2152328500
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: &2152326780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 2
-        version: 3.1.2
-  name: haml
-  requirement: *id012
   prerelease: false
+  version_requirements: *2152326780
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2152313960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 3
-        version: 3.1.3
-  name: sass
-  requirement: *id013
   prerelease: false
+  version_requirements: *2152313960
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &2152312460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
   type: :runtime
+  prerelease: false
+  version_requirements: *2152312460
 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
@@ -247,6 +203,7 @@ files:
 - lib/milkode/cdweb/views/layout.haml
 - lib/milkode/cdweb/views/search.haml
 - lib/milkode/cdweb/views/view.haml
+- lib/milkode/common/archive-zip.rb
 - lib/milkode/common/dbdir.rb
 - lib/milkode/common/dir.rb
 - lib/milkode/common/display_util.rb
@@ -279,52 +236,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_dir.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: []