mistilteinn 0.1.1 → 0.1.2

data/README.markdown

@@ -8,27 +8,28 @@ OVERVIEW
 Mistilteinn for shell is a comamnd to support a development style for
 using git and redmine.
 
-Prerequires
+Prerequisites
 ------------------------------
 
  * Ruby 1.8.7
  * RubyGems 1.4.2 or later
  * git subcommands https://github.com/mistilteinn/git-tools
+ * Git Hooks https://github.com/bleis-tift/Git-Hooks
 
 Install
 ------------------------------
 
-   $ gem install mistilteinn
+    $ gem install mistilteinn
 
 Setup for each project
 ------------------------------
 
 To use mistilteinn, run `mistilteinn init` at each project dirctory.
 
-   $ cd /path/to/project
-   $ git init
-   $ mistilteinn init
-   $ vim .mistilteinn/config.yaml
+    $ cd /path/to/project
+    $ git init
+    $ mistilteinn init
+    $ vim .mistilteinn/config.yaml
 
 Usage
 ------------------------------
@@ -37,24 +38,24 @@ Usage
 
 Check if miltilteinn works:
 
-   $ mistilteinn self-check
+    $ mistilteinn self-check
 
 ### init
 
 Initialize working directory for mistilteinn:
 
-   $ mistilteinn init
-   $ vim .mistilteinn/config.yaml
+    $ mistilteinn init
+    $ vim .mistilteinn/config.yaml
 
 ### list ticket
 
-   $ mistilteinn list
+    $ mistilteinn list
 
 ### create ticket
 
-   $ mistilteinn create hoge
+    $ mistilteinn create hoge
 
-Build(developper only)
+Build(developer only)
 ------------------------------
 
 ### Prerequires
@@ -84,6 +85,8 @@ AUTHOR
 
  * @mzp
  * @suer
+ * @shimomura1004
+ * @mallowlabs
 
 License
 -----------------------

data/bin/mistilteinn

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # -*- mode:ruby; coding:utf-8 -*-
-require 'pp'
 require 'subcommand'
 require 'mistilteinn/config'
 require 'mistilteinn/git'

data/lib/mistilteinn/cli/command.rb

@@ -7,7 +7,7 @@ module Mistilteinn
 
       def initialize(obj)
         obj.command name do|opts|
-          opts.description = 'show current ticket list'
+          opts.description = desc
         end
       end
 

data/lib/mistilteinn/cli/edit.rb

@@ -0,0 +1,11 @@
+module Mistilteinn::Cli
+  class Edit < ::Mistilteinn::Cli::Command
+    name :edit
+    desc 'edit specified ticket'
+
+    def action
+      its.edit args
+    end
+  end
+end
+

data/lib/mistilteinn/cli/init.rb

@@ -23,8 +23,8 @@ module Mistilteinn::Cli
       path = Pathname(::Mistilteinn::Git.root) + name
       path.tap {
         unless path.exist?
-          puts "mkdir -p #{config}"
-          config.mkpath
+          puts "mkdir -p #{path.to_s}"
+          path.mkpath
         end
       }
     end

data/lib/mistilteinn/git.rb

@@ -4,8 +4,8 @@
 module Mistilteinn
   module Git
     class << self
-      def config(name)
-        cmd "git config #{name}"
+      def config(name, value=nil)
+        cmd "git config #{name} #{value or ''}"
       end
 
       def root

data/lib/mistilteinn/ticket/git_config.rb

@@ -1,156 +1,98 @@
 # -*- mode:ruby; coding:utf-8 -*-
 require 'tempfile'
 
+class Tempfile
+  def edit(editor=nil)
+    mtime_before_edit = self.mtime
+    self.close
+    system "#{editor || ENV["EDITOR"]} #{self.path}"
+    self.open
+    return self.mtime != mtime_before_edit
+  end
+  def content=(content)
+    self.rewind
+    self.write content
+  end
+end
+
 module Mistilteinn
   module Ticket
-    class Config
-      def initialize(config_hash, path)
-        @config = config_hash
-        @path = path
-      end
-      attr_reader :config
-
-      def has_key?(key)
-        @config.has_key?(key) || @config.has_key?(key.to_s)
-      end
-
-      def []=(*args)
-        assignment(args[0], args[1])
-      end
-
-      def [](key)
-        key = key.to_s if key.class == Symbol
-        method_missing(key)
+    class GitConfig
+      def initialize(config)
       end
 
-      def method_missing(name, *args)
-        name = name.to_s
-        is_assignment = create_if_nil = false
-        if name[-1..-1] == '=' then
-          is_assignment = true
-          name.slice! -1
-        end
-        if name[-1..-1] == '_' then
-          create_if_nil = true
-          name.slice! -1
-        end
-
-        return assignment(name, args[0]) if is_assignment
-
-        config_object = get_config_object(@path+[name.to_s])
-        return nil if config_object.config.empty? and not create_if_nil
-
-        if config_object.config.class == Hash then
-          config_object
-        else
-          config_object.config
-        end
+      def check
+        'ok'
       end
 
-      private
-      def get_config_object(path)
-        return @@config_objects[path] if @@config_objects.has_key? path
-
-        if @config.has_key? path[-1] then
-          @@config_objects[path] = Config::new(@config[path[-1]], path)
-        else
-          @config[path[-1]] = {}
-          @@config_objects[path] = Config::new({}, path)
+      def tickets
+        last_ticket_id = ::Mistilteinn::Git.config "ticket.last"
+        (1...last_ticket_id.to_i).map do |id|
+          subject = ::Mistilteinn::Git.config "ticket.id/#{id}.subject"
+          status  = ::Mistilteinn::Git.config "ticket.id/#{id}.status"
+          ::Mistilteinn::Ticket::Entry.new(id, subject, status)
         end
       end
 
-      def Config::init
-        @@config_objects = {[] => Config::parse_config}
-        @@config_objects[[]]
-      end
-
-      def Config::parse_config
-        config_hash = {}
-        get_by_regexp('".*"').each do |path,value|
-          subconfig = config_hash
-          elems = path.split '.'
-          elems[0..-2].each do |path|
-            subconfig[path] = {} if subconfig[path].nil?
-            subconfig = subconfig[path]
-          end
-          subconfig[elems[-1]] = value
-        end
-        Config::new(config_hash, [])
-      end
+      def create(title = "")
+        tmpfile = Tempfile.new 'tmp'
+        tmpfile.content = ticket_format({
+          :subject => title,
+          :author  => ::Mistilteinn::Git::config("user.name"),
+          :date    => Time.now,
+          :status  => "new"
+        })
+        tmpfile.edit default_editor
 
-      def Config::get_by_regexp(regex)
-        %x(git config --get-regexp #{regex}).split(/\n/).map do |line|
-          line.match(/(.+?) (.*)/)[1..2]
-        end
-      end
+        ticket_id = (::Mistilteinn::Git.config("ticket.last") || "1").to_i
+        issue_ticket(tmpfile, ticket_id)
+        ::Mistilteinn::Git.config("ticket.last", (ticket_id+1).to_s)
 
-      def Config::set(name, value)
-        %x(git config #{name} "#{value}")
+        tmpfile.unlink
       end
 
-      def assignment(key, value)
-        Config::set("#{@path.join('.')}.#{key}", value)
-      end
-    end
+      def edit(ticket_id)
+        tmpfile = Tempfile.new 'tmp'
+        tmpfile.content = ticket_format({
+          :subject     => ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.subject"),
+          :author      => ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.author"),
+          :date        => ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.date"),
+          :status      => ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.status"),
+          :description => ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.description")
+        })
+        modified = tmpfile.edit default_editor
 
-    class GitConfig
-      class ConfigError < StandardError; end
+        issue_ticket(tmpfile, ticket_id) if modified
 
-      def initialize(config)
-        @config = Config::init
+        tmpfile.unlink
       end
 
-      def tickets
-        lastTicketNo = @config.ticket.ticketno.to_i
-        (1...lastTicketNo).map do |id|
-          data = @config.ticket["id/#{id}"]
-          ::Mistilteinn::Ticket::Entry.new(id, data.subject, data.status)
-        end
+      private
+      def default_editor
+        ::Mistilteinn::Git.config "core.editor"
       end
 
-      def create(title = "")
-        ticketFormat = <<END
-Subject: #{title}
-Author: #{@config.user.name}
-Date: #{Time.now}
-Status: new
+      def ticket_format(data = {})
+        <<END
+Subject: #{data[:subject]}
+Author: #{data[:author]}
+Date: #{data[:date]}
+Status: #{data[:status]}
 Description: |-
-
+  #{data[:description]}
 END
+      end
 
-        editTempFile(ticketFormat) do |f, modified|
-          return if not modified and title.empty?
-
-          ticket = @config.ticket
-          ticketNo = (ticket.ticketno || "1").to_i
-
+      def issue_ticket(datafile, ticket_id)
+        File::open(datafile.path) do |f|
           YAML.load_documents(f) do |yaml|
             yaml.each do |key, value|
-              ticket["id/#{ticketNo}_"][key] = value
+              ::Mistilteinn::Git.config("ticket.id/#{ticket_id}.#{key}", "\"#{value}\"")
             end
           end
-          ticket.ticketno = (ticketNo+1).to_s
         end
       end
 
-      def edit(id)
-      end
-
-      private
-      def editTempFile(initialString, &proc)
-        tmp = Tempfile.new("tmp")
-        tmp.write initialString
-        tmp.close
-
-        editor = @config.core_.editor || ENV["EDITOR"]
-        system "#{editor} #{tmp.path}"
-        File.open(tmp.path) do |f|
-          modified = f.read != initialString
-          f.rewind
-          proc.call(f, modified)
-        end
-        tmp.unlink
-      end
     end
   end
 end

data/lib/mistilteinn/version.rb

@@ -2,5 +2,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
 module Mistilteinn
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/mistilteinn.gemspec

@@ -9,7 +9,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/mistilteinn/mistilteinn-shell"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
+  exclude_from_gem  = File::read('.excluded_from_gem').split("\n")
+  gem.files         = `git ls-files`.split("\n").reject do |file|
+    exclude_from_gem.include? file
+  end
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "mistilteinn"
   gem.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mistilteinn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70162460090560 !ruby/object:Gem::Requirement
+  requirement: &78282030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162460090560
+  version_requirements: *78282030
 - !ruby/object:Gem::Dependency
   name: subcommand
-  requirement: &70162460089900 !ruby/object:Gem::Requirement
+  requirement: &78281770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162460089900
+  version_requirements: *78281770
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162460089320 !ruby/object:Gem::Requirement
+  requirement: &78281510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162460089320
+  version_requirements: *78281510
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70162460088620 !ruby/object:Gem::Requirement
+  requirement: &78281240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162460088620
+  version_requirements: *78281240
 description: Mistilteinn is a command to support a development with git and redmine.
 email:
 - mzp.ppp@gmail.com
@@ -63,17 +63,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .mistilteinn/config.yaml
 - .rspec
 - Gemfile
 - README.markdown
 - Rakefile
-- bin/.gitkeep
 - bin/mistilteinn
 - lib/mistilteinn/cli.rb
 - lib/mistilteinn/cli/command.rb
 - lib/mistilteinn/cli/create.rb
+- lib/mistilteinn/cli/edit.rb
 - lib/mistilteinn/cli/hooks/commit-msg
 - lib/mistilteinn/cli/hooks/common.sh
 - lib/mistilteinn/cli/hooks/pre-commit
@@ -92,7 +90,6 @@ files:
 - lib/mistilteinn/ticket/redmine.rb
 - lib/mistilteinn/version.rb
 - mistilteinn.gemspec
-- spec/.gitkeep
 - spec/config_spec.rb
 - spec/spec_helper.rb
 - spec/ticket/redmine_spec.rb
@@ -116,11 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Mistilteinn is a command to support a development with git and redmine.
-test_files:
-- spec/config_spec.rb
-- spec/spec_helper.rb
-- spec/ticket/redmine_spec.rb
+test_files: []

data/.gitignore

@@ -1,7 +0,0 @@
-*~
-.gem
-.bundle
-Gemfile.lock
-pkg/
-vendor/
-*.gem

data/.mistilteinn/config.yaml

@@ -1,9 +0,0 @@
-ticket:
-  source: redmine
-
-redmine:
-  url: https://codefirst.org/redmine/
-  project: mistilteinn-shell
-
-github:
-  url: https://github.com/mistilteinn/mistilteinn-shell