milkode 0.4.0 → 0.5.0

data/test/test_yaml_file_wrapper.rb

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/02/20
+
+require 'test_helper'
+require 'milkode/cdstk/yaml_file_wrapper.rb'
+require 'milkode/cdstk/package'
+require 'fileutils'
+require 'milkode/common/util'
+
+class TestYamlFileWrapper < Test::Unit::TestCase
+  include Milkode
+
+  def setup
+    @prev_dir = Dir.pwd
+    @tmp_dir = Pathname(File.dirname(__FILE__)) + "tmp"
+    FileUtils.rm_rf(@tmp_dir.to_s)
+    FileUtils.mkdir_p(@tmp_dir.to_s)
+    FileUtils.cd(@tmp_dir.to_s)
+  end
+
+  def test_basic
+    # create
+    yaml = YamlFileWrapper.create
+    assert_equal yaml.contents, []
+    assert_equal yaml.version, '0.2'
+    assert_raise(YamlFileWrapper::YAMLAlreadyExist) { YamlFileWrapper.create }
+
+    # # load
+    yaml = YamlFileWrapper.load
+    assert_equal yaml.contents, []
+    assert_equal yaml.version, '0.2'
+
+    # load fail
+    FileUtils.mkdir 'loadtest'
+    FileUtils.cd 'loadtest' do
+      assert_raise(YamlFileWrapper::YAMLNotExist) { YamlFileWrapper.load }
+    end
+
+    # add
+    yaml.add(Package.create('/path/to/dir1'))
+    yaml.add(Package.create('/path/to/dir2'))
+    yaml.add(Package.create('/path/to/dir3'))
+    assert_equal ['dir1', 'dir2', 'dir3'], yaml.contents.map{|v| v.name }
+
+    # remove
+    yaml.remove(Package.create('/path/to/dir2'))
+    assert_equal ['dir1', 'dir3'], yaml.contents.map{|v| v.name }
+
+    # update
+    yaml.update(Package.create('/path/to/dir1', ["*.bak"]))
+    assert_equal ['*.bak'], yaml.contents[0].ignore
+
+    # find_name
+    assert yaml.find_name('dir1')
+    assert_nil yaml.find_name('dir2')
+
+    # find_dir
+    assert yaml.find_dir('/path/to/dir1')
+    assert_nil yaml.find_dir('/path/to/dir2')
+
+    # save
+    yaml.save
+    r = open('milkode.yaml'){|f|f.read}
+    assert_equal <<EOF, r if Milkode::Util::ruby19?
+---
+version: '0.2'
+contents:
+- directory: /path/to/dir1
+  ignore:
+  - ! '*.bak'
+- directory: /path/to/dir3
+EOF
+  end
+
+  def test_save_otherpath
+    FileUtils.mkdir 'otherpath'
+    yaml = YamlFileWrapper.create('otherpath')
+    yaml.save
+    
+    # save
+    r = open('otherpath/milkode.yaml'){|f|f.read}
+    assert_equal <<EOF, r if Milkode::Util::ruby19?
+---
+version: '0.2'
+contents: []
+EOF
+  end
+  
+  def teardown
+    FileUtils.cd(@prev_dir)
+    FileUtils.rm_rf(@tmp_dir.to_s)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
   segments_generated: true
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 +09:00
+date: 2012-03-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -296,9 +296,11 @@ files:
 - bin/milk
 - lib/milkode/cdstk/cdstk.rb
 - lib/milkode/cdstk/cdstk_command.rb
-- lib/milkode/cdstk/cdstk_yaml.rb
 - lib/milkode/cdstk/cli_cdstk.rb
 - lib/milkode/cdstk/cli_cdstksub.rb
+- lib/milkode/cdstk/milkode_yaml.rb
+- lib/milkode/cdstk/package.rb
+- lib/milkode/cdstk/yaml_file_wrapper.rb
 - lib/milkode/cdweb/app.rb
 - lib/milkode/cdweb/cli_cdweb.rb
 - lib/milkode/cdweb/config.ru
@@ -321,10 +323,12 @@ files:
 - lib/milkode/cdweb/public/images/go-home-5.png
 - lib/milkode/cdweb/public/js/milkode.js
 - lib/milkode/cdweb/views/filelist.haml
+- lib/milkode/cdweb/views/header_menu.haml
 - lib/milkode/cdweb/views/help.haml
 - lib/milkode/cdweb/views/index.haml
 - lib/milkode/cdweb/views/layout.haml
 - lib/milkode/cdweb/views/search.haml
+- lib/milkode/cdweb/views/search_form.haml
 - lib/milkode/cdweb/views/view.haml
 - lib/milkode/common/archive-zip.rb
 - lib/milkode/common/dbdir.rb
@@ -332,6 +336,8 @@ files:
 - lib/milkode/common/display_util.rb
 - lib/milkode/common/grenfiletest.rb
 - lib/milkode/common/grensnip.rb
+- lib/milkode/common/ignore_checker.rb
+- lib/milkode/common/ignore_setting.rb
 - lib/milkode/common/platform.rb
 - lib/milkode/common/string_snip.rb
 - lib/milkode/common/util.rb
@@ -339,11 +345,14 @@ files:
 - lib/milkode/findgrep/result.rb
 - lib/milkode/grep/cli_grep.rb
 - milkode.gemspec
+- test/data/.gitignore
 - test/data/a_project/cdstk.rb
 - test/data/a_project/cdstk_yaml.rb
 - test/data/abc.zip
 - test/data/b_project/runner.rb
 - test/data/b_project/test_dir.rb
+- test/data/no_auto_ignore/.gitignore
+- test/data/no_auto_ignore/a.txt
 - test/data/nodir_abc.zip
 - test/data/nodir_abc_xpi.xpi
 - test/file_assert.rb
@@ -354,7 +363,6 @@ files:
 - test/test_bin_exec.rb
 - test/test_cdstk.rb
 - test/test_cdstk_command.rb
-- test/test_cdstk_yaml.rb
 - test/test_cli_cdstk.rb
 - test/test_cli_grep.rb
 - test/test_coderay_wrapper.rb
@@ -364,10 +372,15 @@ files:
 - test/test_dir.rb
 - test/test_gren_util.rb
 - test/test_helper.rb
+- test/test_ignore_checker.rb
+- test/test_ignore_setting.rb
+- test/test_milkode_yaml.rb
 - test/test_mkurl.rb
+- test/test_package.rb
 - test/test_query.rb
 - test/test_string_snip.rb
 - test/test_util.rb
+- test/test_yaml_file_wrapper.rb
 has_rdoc: true
 homepage: http://github.com/ongaeshi/milkode
 licenses: 

data/lib/milkode/cdstk/cdstk_yaml.rb

@@ -1,140 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file 
-# @brief
-# @author ongaeshi
-# @date   2011/02/20
-
-require 'yaml'
-require 'pathname'
-require 'milkode/common/dbdir'
-
-module Milkode
-  class CdstkYaml
-    class YAMLAlreadyExist < RuntimeError
-    end
-    
-    class YAMLNotExist < RuntimeError
-    end
-
-    def self.create(path = ".")
-      yf = yaml_file(path)
-      raise YAMLAlreadyExist.new if FileTest.exist? yf
-      obj = CdstkYaml.new(yf, {'contents' => [], 'version' => 0.1})
-      obj.save
-      return obj
-    end
-
-    def self.load(path = ".")
-      yf = yaml_file(path)
-      raise YAMLNotExist.new unless FileTest.exist? yf
-      open(yf) do |f|
-        return CdstkYaml.new(yf, YAML.load(f.read()))
-      end
-    end
-
-    def initialize(yaml_file, data)
-      @yaml_file = yaml_file
-      @data = data
-      normalize
-    end
-
-    def normalize
-      if (Util::platform_win?)
-        contents.each do |v|
-          v['directory'] = Util::normalize_filename v['directory']
-        end
-      end
-    end
-
-    def add(dirs)
-      contents.concat(dirs.map{|v|{'directory' => v}})
-      contents.uniq!
-    end
-
-    def remove(query)
-      r = query.select_any?(contents)
-      r.each {|v| contents.delete v}
-    end
-
-    def save
-      open(@yaml_file, "w") { |f| YAML.dump(@data, f) }
-    end
-
-    def contents
-      @data['contents']
-    end
-
-    def package_num
-      @data['contents'].size
-    end
-
-    def directorys
-      contents.map{|v|v['directory']}
-    end
-
-    def version
-      @data['version']
-    end
-
-    def list(query = nil)
-      query ? query.select_all?(contents) : contents
-    end
-
-    def exist?(shortname)
-      @data['contents'].find {|v| File.basename(v['directory']) == shortname }   
-    end
-
-    def cant_add_directory?(dir)
-      @data['contents'].find {|v|
-        v['directory'] != File.expand_path(dir) &&
-        File.basename(v['directory']) == File.basename(dir)
-      }
-    end
-
-    def cleanup
-      contents.delete_if do |v|
-        if (!File.exist? v['directory'])
-          yield v if block_given?
-          true
-        else
-          false
-        end
-      end
-    end
-
-    def package_root(dir)
-      nd = Util::normalize_filename dir
-      @data['contents'].find do |v|
-        v if nd =~ /^#{v['directory']}/
-      end
-    end
-
-    def package_root_dir(dir)
-      package = package_root(dir)
-      (package) ? package['directory'] : nil
-    end
-
-    def self.yaml_file(path)
-      Dbdir.yaml_path(path)
-    end
-
-    class Query
-      def initialize(keywords)
-        @keywords = keywords
-      end
-
-      def select_any?(contents)
-        contents.find_all do |v|
-          @keywords.any? {|s| File.basename(v['directory']).include? s }
-        end
-      end
-
-      def select_all?(contents)
-        contents.find_all do |v|
-          @keywords.all? {|s| File.basename(v['directory']).include? s }
-        end
-      end
-    end
-  end
-end

data/test/test_cdstk_yaml.rb

@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file 
-# @brief
-# @author ongaeshi
-# @date   2011/02/20
-
-require 'test_helper'
-require 'milkode/cdstk/cdstk_yaml.rb'
-require 'fileutils'
-
-class TestCdstkYaml < Test::Unit::TestCase
-  include Milkode
-
-  def setup
-    @prev_dir = Dir.pwd
-    @tmp_dir = Pathname(File.dirname(__FILE__)) + "tmp"
-    FileUtils.rm_rf(@tmp_dir.to_s)
-    FileUtils.mkdir_p(@tmp_dir.to_s)
-    FileUtils.cd(@tmp_dir.to_s)
-  end
-
-  def test_000
-    # create
-    yaml = CdstkYaml.create
-    assert_equal yaml.contents, []
-    assert_equal yaml.version, 0.1
-    assert_raise(CdstkYaml::YAMLAlreadyExist) { CdstkYaml.create }
-
-    # load
-    yaml = CdstkYaml.load
-    assert_equal yaml.contents, []
-    assert_equal yaml.version, 0.1
-
-    # load fail
-    FileUtils.mkdir 'loadtest'
-    FileUtils.cd 'loadtest' do
-      assert_raise(CdstkYaml::YAMLNotExist) { CdstkYaml.load }
-    end
-
-    # add
-    yaml.add(['dir1'])
-    yaml.add(['dir2', 'dir3'])
-    assert_equal ['dir1', 'dir2', 'dir3'], yaml.directorys
-
-    # remove
-    yaml.add(['dir2', 'dir4', 'dir5'])
-    yaml.remove(CdstkYaml::Query.new ['dir5'])
-    yaml.remove(CdstkYaml::Query.new ['dir2', 'dir3'])
-    assert_equal ['dir1', 'dir4'], yaml.directorys
-
-    # save
-    yaml.save
-    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
-    FileUtils.mkdir 'otherpath'
-    yaml = CdstkYaml.create('otherpath')
-    yaml.save
-    
-    # save
-    r = YAML.load(open('otherpath/milkode.yaml').read)
-    assert_equal 0.1, r['version']
-    assert_equal([], r['contents'])
-  end
-
-  def test_query
-    d = 'directory'
-    
-    contents = [{d => 'key'}, {d => 'keyword'}, {d => 'not'}]
-
-    query = CdstkYaml::Query.new(['key'])
-    assert_equal [{d => 'key'}, {d => 'keyword'}], query.select_any?(contents)
-
-    query = CdstkYaml::Query.new(['word'])
-    assert_equal [{d => 'keyword'}], query.select_any?(contents)
-
-    contents = [{d => 'a/dir'}, {d => 'b/dia'}]
-    query = CdstkYaml::Query.new(['a'])
-    assert_equal [{d => 'b/dia'}], query.select_any?(contents) # ディレクトリ名は含めない
-  end
-
-  def test_list
-    src = <<EOF
-version: 0.1
-contents: 
-- directory: /a/dir1
-- directory: /b/dir4
-EOF
-
-    yaml = CdstkYaml.new('dummy.yaml', YAML.load(src))
-    assert_equal [{"directory"=>"/a/dir1"}, {"directory"=>"/b/dir4"}], yaml.list
-    assert_equal [{"directory"=>"/b/dir4"}], yaml.list(CdstkYaml::Query.new(['4']))
-    assert_equal [], yaml.list(CdstkYaml::Query.new(['a']))
-    assert_equal [{"directory"=>"/a/dir1"}, {"directory"=>"/b/dir4"}], yaml.list(nil)
-  end
-
-  def test_remove
-    src = <<EOF
-version: 0.1
-contents: 
-- directory: /a/dir1
-- directory: /b/dir4
-EOF
-
-    yaml = CdstkYaml.new('dummy.yaml', YAML.load(src))
-
-    yaml.remove(CdstkYaml::Query.new(['dir4']))
-    assert_equal [{"directory"=>"/a/dir1"}], yaml.list
-
-    yaml.remove(CdstkYaml::Query.new(['dir1']))
-    assert_equal [], yaml.list
-
-    # ---
-
-    yaml = CdstkYaml.new('dummy.yaml', YAML.load(src))
-
-    yaml.remove(CdstkYaml::Query.new(['dir1']))
-    assert_equal [{"directory"=>"/b/dir4"}], yaml.list
-
-    yaml.remove(CdstkYaml::Query.new([]))
-    assert_equal [{"directory"=>"/b/dir4"}], yaml.list
-
-  end
-
-  def test_exist
-    src = <<EOF
-version: 0.1
-contents: 
-- directory: /a/dir1
-- directory: /b/dir12
-- directory: /b/dir4
-EOF
-
-    yaml = CdstkYaml.new('dummy.yaml', YAML.load(src))
-
-    assert_not_nil yaml.exist?('dir1')
-    assert_not_nil yaml.exist?('dir12')
-    assert_nil yaml.exist?('dir123')
-    assert_nil yaml.exist?('dir')
-  end
-
-  def test_package_root
-    src = <<EOF
-version: 0.1
-contents: 
-- directory: /a/dir1
-- directory: /path/to/dir
-- directory: /a/b/c
-EOF
-
-    yaml = CdstkYaml.new('dummy.yaml', YAML.load(src))
-
-    assert_equal nil           , yaml.package_root_dir('/not_dir')
-    assert_equal "/a/dir1"     , yaml.package_root_dir('/a/dir1/dir3')
-    assert_equal nil           , yaml.package_root_dir('/hoge/a/dir1/dir3')
-    assert_equal '/path/to/dir', yaml.package_root_dir('/path/to/dir')
-  end
-  
-  def teardown
-    FileUtils.cd(@prev_dir)
-    FileUtils.rm_rf(@tmp_dir.to_s)
-  end
-end