milkode 0.4.0 → 0.5.0

data/lib/milkode/cdstk/cli_cdstk.rb

@@ -19,6 +19,7 @@ The most commonly used #{File.basename($0)} are:
   dir         Disp package dir.
   dump        Dump records.
   grep        Print lines matching a pattern
+  ignore      Ignore setting.
   info        Disp information.
   init        Init db.
   list        List packages. 
@@ -49,35 +50,40 @@ EOF
       suboptions = Hash.new
       
       subopt['init'], suboptions['init'] = CLI_Cdstksub.setup_init
-      subopt['add'] = CLI_Cdstksub.setup_add
+      subopt['add'], suboptions['add'] = CLI_Cdstksub.setup_add
       subopt['update'], suboptions['update'] = CLI_Cdstksub.setup_update
       subopt['remove'], suboptions['remove'] = CLI_Cdstksub.setup_remove
       subopt['list'], suboptions['list'] = CLI_Cdstksub.setup_list
       subopt['pwd'], suboptions['pwd'] = CLI_Cdstksub.setup_pwd
       subopt['cleanup'], suboptions['cleanup'] = CLI_Cdstksub.setup_cleanup
-      subopt['rebuild'] = OptionParser.new("#{File.basename($0)} rebuild")
+      subopt['rebuild'], suboptions['rebuild'] = CLI_Cdstksub.setup_rebuild
       subopt['dump'] = OptionParser.new("#{File.basename($0)} dump")
       subopt['web'], suboptions['web'] = CLI_Cdstksub.setup_web
       subopt['dir'], suboptions['dir'] = CLI_Cdstksub.setup_dir
       subopt['setdb'], suboptions['setdb'] = CLI_Cdstksub.setup_setdb
       subopt['mcd'], suboptions['mcd'] = CLI_Cdstksub.setup_mcd
       subopt['info'], suboptions['info'] = CLI_Cdstksub.setup_info
+      subopt['ignore'], suboptions['ignore'] = CLI_Cdstksub.setup_ignore
       
       if (subopt[subcommand])
         subopt[subcommand].parse!(arguments) unless arguments.empty?
         init_default = suboptions['init'][:init_default]
 
-        db_dir = select_dbdir(subcommand, init_default)
+        db_dir = select_dbdir(subcommand, init_default, arguments)
         obj = Cdstk.new(stdout, db_dir)
 
         case subcommand
         when 'init'
-          FileUtils.mkdir_p db_dir if (init_default)
-          obj.init 
+          if (arguments.size <= 1)
+            FileUtils.mkdir_p db_dir if (init_default || init_specify_dbddir?(arguments))
+            obj.init(suboptions[subcommand])
+          else
+            $stderr.puts "milk init [db_dir] (Cannot specify two 'db_dir')"
+          end
         when 'update'
           obj.update(arguments, suboptions[subcommand])
         when 'add'
-          obj.add(arguments)
+          obj.add(arguments, suboptions[subcommand])
         when 'remove'
           obj.remove(arguments, suboptions[subcommand])
         when 'list'
@@ -87,7 +93,7 @@ EOF
         when 'cleanup'
           obj.cleanup(suboptions[subcommand])
         when 'rebuild'
-          obj.rebuild
+          obj.rebuild(arguments, suboptions[subcommand])
         when 'dump'
           obj.dump
         when 'web'
@@ -101,6 +107,12 @@ EOF
           obj.mcd(arguments, suboptions[subcommand])
         when 'info'
           obj.info(arguments, suboptions[subcommand])
+        when 'ignore'
+          begin
+            obj.ignore(arguments, suboptions[subcommand])
+          rescue IgnoreError => e
+            stdout.puts e.message
+          end
         end
       else
         if subcommand
@@ -111,9 +123,11 @@ EOF
       end
     end
 
-    def self.select_dbdir(subcommand, init_default)
+    def self.select_dbdir(subcommand, init_default, arguments)
       if (subcommand == 'init')
-        if (init_default)
+        if (init_specify_dbddir?(arguments))
+          arguments[0]
+        elsif (init_default)
           Dbdir.default_dir
         else
           '.'
@@ -126,6 +140,10 @@ EOF
         end
       end
     end
+
+    def self.init_specify_dbddir?(arguments)
+      arguments.size == 1
+    end
  
   end
 end

data/lib/milkode/cdstk/cli_cdstksub.rb

@@ -10,8 +10,9 @@ module Milkode
     def self.setup_init
       options = {:init_default => false}
       
-      opt = OptionParser.new("#{File.basename($0)} init")
+      opt = OptionParser.new("#{File.basename($0)} init [db_dir]")
       opt.on('--default', 'Init default db, ENV[\'MILKODE_DEFAULT_DIR\'] or ~/.milkode.') { options[:init_default] = true }
+      opt.on('-s', '--setdb', 'With setdb.') { options[:setdb] = true }
 
       return opt, options
     end
@@ -19,8 +20,10 @@ module Milkode
     def self.setup_add
       bin = File.basename($0)
       
+      options = {:ignore => []}
+
       opt = OptionParser.new(<<EOF)
-#{bin} add package1 [package2 ...]
+#{bin} add dir1 [dir2 ...]
 usage:
   #{bin} add /path/to/dir1
   #{bin} add /path/to/dir2 /path/to/dir3
@@ -28,9 +31,15 @@ usage:
   #{bin} add /path/to/zipfile.zip
   #{bin} add /path/to/addon.xpi
   #{bin} add http://example.com/urlfile.zip
+
+option:
 EOF
+      # opt.on('-n NAME', '--name NAME', 'Specify name (default: File.basename(dir))') {|v| options[:name] = v }
+      opt.on('-i PATH', '--ignore PATH', 'Ignore path.') {|v| options[:ignore] << v }
+      opt.on('--no-auto-ignore', 'Disable auto ignore (.gitignore)') { options[:no_auto_ignore] = true }
+      opt.on('-v', '--verbose', 'Be verbose.')   { options[:verbose] = true }
 
-      opt
+      return opt, options
     end
 
     def self.setup_update
@@ -38,6 +47,7 @@ EOF
 
       opt = OptionParser.new("#{File.basename($0)} update [keyword1 keyword2 ...]")
       opt.on('--all', 'Update all.') { options[:all] = true }
+      opt.on('-v', '--verbose', 'Be verbose.') { options[:verbose] = true }
 
       return opt, options
     end
@@ -45,8 +55,10 @@ EOF
     def self.setup_remove
       options = {:force => false}
 
-      opt = OptionParser.new("#{File.basename($0)} remove package1 [package2 ...]")
-      opt.on('-f', '--force', 'Force remove.') { options[:force] = true }
+      opt = OptionParser.new("#{File.basename($0)} remove keyword1 [keyword2 ...]")
+      opt.on('--all', 'Update all.') { options[:all] = true }
+      opt.on('-f', '--force',   'Force remove.') { options[:force] = true }
+      opt.on('-v', '--verbose', 'Be verbose.')   { options[:verbose] = true }
 
       return opt, options
     end
@@ -78,6 +90,16 @@ EOF
       return opt, options
     end
 
+    def self.setup_rebuild
+      options = {}
+      
+      opt = OptionParser.new("#{File.basename($0)} keyword1 [keyword2 ...]")
+      opt.on('--all', 'Rebuild all.') { options[:all] = true}
+      opt.on('-v', '--verbose', 'Be verbose.') { options[:verbose] = true }
+
+      return opt, options
+    end
+
     def self.setup_web
       options = {
         :environment => ENV['RACK_ENV'] || "development",
@@ -121,7 +143,7 @@ EOF
       options = {}
       
       opt = OptionParser.new("#{File.basename($0)} setdb")
-      opt.on('--reset', 'Reset default db.') {|v| options[:reset] = true }
+      opt.on('--default', '--reset', 'Reset default db.') {|v| options[:reset] = true }
 
       return opt, options
     end
@@ -141,5 +163,21 @@ EOF
 
       return opt, options
     end
+
+    def self.setup_ignore
+      bin = File.basename($0)
+      
+      options = {}
+
+      opt = OptionParser.new("#{File.basename($0)} ignore [path ...]")
+      opt.on('-p PACKAGE', '--package PACKAGE', 'Specify ignore package.') {|v| options[:package] = v }
+      opt.on('-d', '--delete', 'Delete ignore') { options[:delete] = true }
+      opt.on('--delete-all', 'Delete all') { options[:delete_all] = true }
+      opt.on('--test', 'Ignore test, Display complete list') { options[:test] = true }
+
+      return opt, options
+    end
+
+
   end
 end

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/02/21
+
+require 'yaml'
+require 'milkode/cdstk/package'
+require 'milkode/common/util'
+
+module Milkode
+  class MilkodeYaml
+    MILKODE_YAML_VERSION = '0.2'
+
+    EMPTY_YAML = <<EOF
+---
+version: '#{MILKODE_YAML_VERSION}'
+contents: []
+EOF
+
+    attr_reader :contents
+    
+    def initialize(str = nil)
+      @data = YAML.load(str || EMPTY_YAML)
+      @contents = parse_contents
+    end
+
+    def dump
+      YAML.dump(@data)
+    end
+
+    def version
+      @data['version']
+    end
+
+    # パッケージを追加
+    def add(package)
+      @contents.push package
+      update_contents
+    end
+
+    # 同名パッケージの内容を置き換え
+    def update(package)
+      i = @contents.find_index {|v| v.same_name?(package.name) }
+      raise unless i
+      @contents[i] = package
+      update_contents
+    end
+
+    # パッケージを削除
+    def remove(package)
+      @contents.delete(package)
+      update_contents
+    end
+
+    # 名前が同じパッケージを検索
+    def find_name(name)
+      @contents.find {|v| v.same_name?(name)}
+    end
+
+    # ディレクトリ名が同じパッケージを検索
+    def find_dir(directory)
+      @contents.find {|v| v.directory == directory}
+    end
+
+    # 指定ディレクトリの所属するパッケージのルートディレクトリを得る。
+    # 見つからない場合はnilを返す。
+    def package_root(dir)
+      nd = Util::normalize_filename dir
+      @contents.find do |v|
+        v if nd =~ /^#{v.directory}/
+      end
+    end
+
+    # マイグレーション
+    def migrate
+      if (version != MILKODE_YAML_VERSION)
+        # バージョン番号
+        @data['version'] = MILKODE_YAML_VERSION
+
+        # パッケージ
+        contents.each{|v| v.migrate}
+
+        # migrateが起きた
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    def parse_contents
+      @data['contents'].map do |v|
+        Package.new(v)
+      end
+    end
+
+    def update_contents
+      @data['contents'] = @contents.map{|v| v.hash }
+    end
+  end
+end
+

data/lib/milkode/cdstk/package.rb

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/02/21
+
+require 'milkode/common/util'
+
+module Milkode
+  class Package
+    def self.create(dir, ignore=nil)
+      if ignore && ignore.size > 0
+        Package.new({"directory" => dir, "ignore" => ignore})
+      else
+        Package.new({"directory" => dir})
+      end
+    end
+
+    def initialize(hash)
+      @hash = hash
+      normalize
+    end
+
+    def name
+      if options[:name]
+        options[:name]
+      else
+        File.basename(directory)
+      end
+    end
+
+    def directory
+      @hash['directory']
+    end
+
+    def ignore
+      @hash['ignore'] || []
+    end
+
+    def set_ignore(ignore)
+      @hash['ignore'] = ignore
+    end
+
+    def options
+      @hash['options'] || {}
+    end
+
+    def set_options(options)
+      @hash['options'] = options
+    end
+
+    def hash
+      @hash
+    end
+
+    def migrate
+      # 色々あって、ignore値はデフォルトで設定しないようにした
+      # @hash['ignore'] = [] unless ignore
+    end
+
+    # 同名パッケージか？
+    def same_name?(a_name)
+      name == a_name
+    end
+
+    # 同値検査
+    def ==(rhs)
+      name == rhs.name && directory == rhs.directory && ignore == rhs.ignore
+    end
+
+    private
+
+    def normalize
+      if (Util::platform_win?)
+        @hash['directory'] = Util::normalize_filename(directory)
+      end
+    end
+    
+  end
+end
+
+

data/lib/milkode/cdstk/yaml_file_wrapper.rb

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/02/20
+
+require 'yaml'
+require 'milkode/common/dbdir'
+require 'milkode/cdstk/milkode_yaml'
+
+module Milkode
+  class YamlFileWrapper
+    class YAMLAlreadyExist < RuntimeError ; end
+    class YAMLNotExist < RuntimeError     ; end
+
+    def self.yaml_file(path)
+      Dbdir.yaml_path(path)
+    end
+
+    def self.create(path = ".")
+      yf = yaml_file(path)
+      raise YAMLAlreadyExist.new if FileTest.exist? yf
+      obj = YamlFileWrapper.new(yf, MilkodeYaml.new)
+      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 YamlFileWrapper.new(yf, MilkodeYaml.new(f.read()))
+      end
+    end
+
+    def self.load_if(path = ".")
+      begin
+        load(path)
+      rescue YAMLNotExist
+        nil
+      end
+    end
+
+    def initialize(yaml_file, data)
+      @yaml_file = yaml_file
+      @data = data
+      migrate
+    end
+
+    def contents
+      @data.contents
+    end
+
+    def find_name(name)
+      @data.find_name(name)
+    end
+
+    def find_dir(dir)
+      @data.find_dir(dir)
+    end
+
+    def add(package)
+      @data.add package
+    end
+
+    def update(package)
+      @data.update package
+    end
+
+    def remove(package)
+      @data.remove package
+    end
+
+    def package_root(dir)
+      @data.package_root(dir)
+    end
+
+    def save
+      open(@yaml_file, "w") { |f| f.write(@data.dump) }
+    end
+
+    def version
+      @data.version
+    end
+
+    def migrate
+      if (@data.migrate)
+        puts "milkode.yaml is old '#{version}'. Convert to '#{MilkodeYaml::MILKODE_YAML_VERSION}'."
+        save
+      end
+    end
+  end
+end