rtask 009 → 010

data/History.txt

@@ -1,3 +1,11 @@
+== 010: 2008-07-10
+* yhara:
+  * patch for new rubyforge(1.0.0) interface
+  * check to exist zip file
+* Keita Yamaguchi:
+  * added gem editor(curses version)
+  * removed gemify dependency
+
 == 009: 2008-04-22
 * Keita Yamaguchi:
   * Fixed publish task

data/README.txt

@@ -4,15 +4,23 @@ Author::    Keita Yamaguchi(山口 慶太) <keita.yamaguchi@gmail.com>
 Copyright:: © Keita Yamaguchi, 2008. All rights reserved.
 License::   Ruby License
 
-RTask provides easy way to release Ruby’s gem packages. This also provides useful Rake tasks for releasing packages and uploading documents.
+RTask provides easy way to release RubyGems packages. This also provides useful Rake tasks for releasing packages and uploading documents.
 
 == Usage
 
 See {the document}[http://github.com/keita/rtask/wikis] for details.
 
+=== Edit gemspec
+
+RTask creates a gem by gemspec file.
+
+  % rtask
+
+The gem generated by RTask contains files included in Manifest.txt.
+
 === How to release packages
 
-First, you should setup rubyforge and gemify. Next, let's run rtask command.
+First, you should setup rubyforge. Next, let's run rtask command.
 
   % rtask -r
 
@@ -28,11 +36,14 @@ It's all.
 
   % rtask -c
 
+== Contributers
+
+* yhara(http://github.com/yhara)
+
 == Links
 
 * RTask
   * {RubyForge}[http://rubyforge.org/projects/rtask/]
   * {GitHub}[http://github.com/keita/rtask/tree/master]
-* {Gemify}[http://dojo.rubyforge.org/gemify/] : RTask is developed for using with Gemify.
-* author's blog(written in Japanese)
+* Author's blog(written in Japanese)
   * {¬¬日常日記}[http://d.hatena.ne.jp/keita_yamaguchi/]

data/bin/rtask

@@ -2,6 +2,7 @@
 
 require "rubygems"
 require "rtask"
+require "rtask/ui"
 require "optparse"
 
 $task = RTask.new(:use => :all)
@@ -62,5 +63,7 @@ OptionParser.new(nil, 24) do |opt|
     puts RTask::VERSION; exit
   end
 
-  opt.parse!(ARGV)
+  opt.parse(ARGV)
 end
+
+RTask::UI.start($task, :curses) unless ARGV.size > 0

data/lib/rtask.rb

@@ -1,12 +1,8 @@
 require 'rake'
 require 'rubyforge'
-require 'gemify'
 
-# == Usage
-# First, you setup gemify.
-#   % gemify
-#
-# Second, add RTask in your Rakefile:
+# == Usage for Rake users
+# RTask in your Rakefile:
 #   require 'rubygems'
 #   require 'rtask'
 #   RTask.new
@@ -24,18 +20,20 @@ require 'gemify'
 #   rake tgz           # Create the tgz package
 #
 class RTask
-  VERSION = "009"
+  VERSION = "010"
   MESSAGE = Hash.new
 
-  attr_reader :project, :package, :version
+  attr_reader :spec, :project, :package, :version
 
   def initialize(config={:use => :all})
+    @spec = init_spec
+    @spec.files = manifest
     @rubyforge = ::RubyForge.new
+    @rubyforge.configure
     @user = @rubyforge.userconfig
-    @gemify = Gemify.new.instance_eval{@settings}
-    @project = @gemify[:rubyforge_project]
-    @package = @gemify[:name]
-    @version = @gemify[:version]
+    @project = @spec.rubyforge_project
+    @package = @spec.name
+    @version = @spec.version
     @lib_version = config[:version]
     if config.has_key?(:use)
       list = config[:use]
@@ -45,6 +43,40 @@ class RTask
     yield self if block_given?
   end
 
+  # Initialize gem specification.
+  def init_spec
+    # if .rtask exists
+    if File.exist?(".rtask")
+      return YAML.load(File.read(".rtask"))
+    end
+
+    # if gemspec exists
+    Dir.glob("*.gemspec") do |spec|
+      return RTask::Spec.new(::Gem::Specification.load(spec))
+    end
+
+    # if .gemified exists
+    if File.exist?(".gemified")
+      data = YAML.load(File.read(".gemified"))
+      spec = ::Gem::Specification.new
+      spec.summary = data[:summary]
+      spec.email = data[:email]
+      spec.name = data[:name]
+      spec.homepage = data[:homepage]
+      spec.version = data[:version]
+      spec.rubyforge_project = data[:rubyforge_project]
+      # assume gemify's "dependencies" are runtime dependencies
+      data[:dependencies].each do |dep|
+        spec.add_runtime_dependency dep
+      end
+      spec.authors << data[:author]
+      return RTask::Spec.new(spec)
+    end
+
+    # no specification
+    return RTask::Spec.new
+  end
+
   # define task
   def self.define_task(description, rule)
     name = rule
@@ -120,9 +152,9 @@ class RTask
     gem = filename + ".gem"
     tgz = filename + ".tgz"
     zip = filename + ".zip"
-    if File.exist?(gem) and File.exist?(tgz)
+    if File.exist?(gem) and File.exist?(tgz) and File.exist?(zip)
       @rubyforge.add_release @project, @package, @version, gem, tgz, zip
-      puts "Released #{gem} and #{tgz}"
+      puts "Released #{gem}, #{tgz}, and #{zip}"
     else
       puts "Please make gem and tgz files first: rake gem tgz"
       exit
@@ -136,7 +168,7 @@ class RTask
 
   # Task for creating gem
   def gem
-    sh "gemify -I"
+    Gem.build(@spec)
   end
 
   define_task "Create the gem package", :gem
@@ -168,7 +200,7 @@ class RTask
   private
 
   def manifest
-    manifest = Dir.glob("*Manifest*", File::FNM_CASEFOLD).first
+    manifest = Dir.glob("*manifest*", File::FNM_CASEFOLD).first
     unless manifest
       puts "Please make manifest"
       exit
@@ -176,3 +208,6 @@ class RTask
     File.read(manifest).split("\n")
   end
 end
+
+require "rtask/spec"
+require "rtask/gem"

data/lib/rtask/gem.rb

@@ -0,0 +1,22 @@
+require "rubygems/specification"
+
+class RTask
+  module Gem
+    def self.build(spec)
+      ::Gem::Builder.new(spec).build
+    end
+
+    def self.gemspec(spec)
+      spec.gemspec
+    end
+  end
+end
+
+# for showing gem specs
+module Gem
+  class Dependency
+    def to_s
+      @name.to_s
+    end
+  end
+end

data/lib/rtask/spec.rb

@@ -0,0 +1,46 @@
+require "delegate"
+
+class RTask
+  class Spec < DelegateClass(::Gem::Specification)
+    def initialize(gem_spec = ::Gem::Specification.new)
+      super(gem_spec)
+    end
+
+    def attributes
+      __getobj__.class.attribute_names
+    end
+
+    def bool_attributes
+      [:has_rdoc]
+    end
+
+    def standard
+      __getobj__.class.required_attributes +
+        [:authors, :email, :homepage, :rubyforge_project, :description,
+         :has_rdoc, :dependencies ] -
+        [:rubygems_version, :specification_version, :date, :require_paths]
+    end
+
+    def required
+      ::Gem::Specification.attribute_names.each do |name|
+        ::Gem::Specification.required_attribute?()
+      end
+    end
+
+    def array
+      ::Gem::Specification.array_attributes
+    end
+
+    def type_of(name)
+      if array.include?(name)
+        return :array
+      elsif bool.include?(name)
+        return :bool
+      else
+        return :string
+      end
+    end
+
+    alias :bool :bool_attributes
+  end
+end

data/lib/rtask/ui.rb

@@ -0,0 +1,10 @@
+module RTask::UI
+  # Start the user interface.
+  def self.start(rtask, name)
+    case name
+    when :curses
+      require "rtask/ui/curses"
+      RTask::UI::CursesInterface.new(rtask).start
+    end
+  end
+end

data/lib/rtask/ui/curses.rb

@@ -0,0 +1,327 @@
+require "delegate"
+require "cursesx"
+require "readline"
+require "termios"
+
+module RTask::UI
+  class CursesInterface
+    include ::Curses
+
+    def initialize(rtask)
+      @rtask = rtask
+    end
+
+    def start
+      # init curses
+      init_screen; start_color; cbreak; noecho; nl
+
+      # init color
+      define_color :banner, :white, :blue
+      define_color :attribute, :blue, :black
+      define_color :current_position, :red, :black
+      define_color :required, :red, :black
+      define_color :usage, :white, :blue
+
+      # start the main window
+      @main = stdscr
+      @main.instance_variable_set(:@spec, @rtask.spec)
+      @main.extend Main
+      @main.start
+    end
+
+    module Main
+      attr_reader :spec
+
+      def self.extended(obj)
+        obj.instance_eval do
+          @awin = subwin maxy-7, maxx, 4, 0, Attribute
+          @bwin = subwin 4, maxx, 0, 0, Banner
+          @dwin = subwin 1, maxx, maxy-1, 0, Display
+          @uwin = subwin 1, maxx, maxy-2, 0, Usage
+        end
+      end
+
+      # Start to render main window.
+      def start
+        draw; @awin.start
+      end
+
+      # Draw windows.
+      def draw
+        clear; children.each {|win| win.draw }
+      end
+
+      # Show the message.
+      def message(msg); @dwin << msg; end
+
+      # Input.
+      def input(msg, val=""); @dwin.input(msg, val); end
+
+      # Wait to input a character.
+      def input_char(msg); @dwin.input_char(msg); end
+    end
+
+    # Hedding banner.
+    module Banner
+      def draw
+        clear
+        attron(color(:banner)) do
+          self << "RTask: gemspec editor".center(maxx)
+        end
+        setpos(2, 0)
+        addstr "Edit .gemspec"
+        refresh
+      end
+    end
+
+    # Display window for showing messages.
+    module Display
+      def draw; clear; end
+
+      # Show the message.
+      def <<(msg)
+        clear
+        setpos(0, 0)
+        addstr(msg.to_s.ljust(maxx))
+        refresh
+      end
+
+      # Wait to input a line.
+      def input(msg, val = "")
+        clear
+        setpos(0, 0)
+        refresh
+
+        # setup io config
+        tio = Termios.getattr(STDIN)
+        tio.lflag |= Termios::ECHO
+        Termios.setattr(STDIN, Termios::TCSANOW, tio)
+
+        # read
+        Readline::HISTORY << val.to_s
+        res = Readline.readline("> #{msg}: ")
+
+        # restore io config
+        tio.lflag &= ~Termios::ECHO
+        Termios.setattr(STDIN, Termios::TCSANOW, tio)
+
+        return res
+      end
+
+      # Wait to input a character.
+      def input_char(msg)
+        clear
+        setpos(0, 0)
+        addstr("> #{msg}: ")
+        refresh
+        return echo { getch }
+      end
+    end
+
+    # Attribute list window.
+    module Attribute
+
+      def self.extended(obj)
+        obj.instance_eval do
+          # doesn't show all
+          @show_all = false
+          # gem spec
+          @spec = parent.spec
+          # displayed top item
+          @top = 0
+          # selected position
+          @position = 0
+          # width
+          @key_width = @spec.attributes.inject(0) do |m, n|
+            m > n.to_s.size ? m : n.to_s.size
+          end
+          # keypad is ok
+          keypad(true)
+        end
+      end
+
+      def attributes
+        @show_all ? @spec.attributes : @spec.standard
+      end
+
+      def draw
+        clear
+        @top.upto(@top+maxy-1) do |idx|
+          break unless attributes[idx]
+          setpos(idx - @top, 0)
+          show_attribute(attributes[idx], @position == idx)
+        end
+        refresh
+      end
+
+      def start
+        loop do
+          # handles input
+          case c = getch
+          when ?a; toogle_show_all
+          when ?u, ::Curses::KEY_UP     ; up
+          when ?d, ::Curses::KEY_DOWN   ; down
+          when ?c, ::Curses::KEY_CTRL_J ; change
+          when ?b; build_gem
+          when ?s; save
+          when ?i; IncludedFiles.new(parent.files)
+          when ?q; quit
+          else
+            parent.message "[" + ::Curses.keyname(c).to_s + "]" if $DEBUG
+          end
+
+          # redraw
+          draw
+        end
+      end
+
+      # Move up.
+      def up
+        if @position != 0
+          @position -= 1
+          @top -= 1 if @top == @position + 1
+        end
+      end
+
+      # Move down.
+      def down
+        if @position < attributes.size - 1
+          @position += 1
+          @top += 1 if @position == @top + maxy
+        end
+      end
+
+      # Show all items.
+      def toogle_show_all
+        @show_all = !@show_all
+        @top, @position = 0, 0
+      end
+
+      # Build the gem.
+      def build_gem
+        unless RTask::Gem.build(@spec)
+          parent.message "You need to fill out all the required fields"
+        else
+          gemname = "#{@spec.name}-#{@spec.version}.gem"
+          parent.message("Created " + gemname)
+        end
+      end
+
+      def save
+        specname = "#{@spec.name}.gemspec"
+
+        # check required attrs
+        if Gem::Specification.required_attributes.any? do |sym|
+            @spec.send(sym).nil?
+          end
+          parent.message "You need to fill out all the required fields"
+        else
+          File.open(specname, "w") do |file|
+            file.write @spec.to_ruby
+          end
+          parent.message "Saved #{specname}"
+          @changed = false
+        end
+      end
+
+      def quit
+        if @changed
+          res = ::Curses.keyname(parent.input_char(<<-__Q__.chomp))
+Changes are not saved. Quit? (y or n)
+          __Q__
+          return unless res.upcase == "Y"
+        end
+        exit
+      end
+
+      def change
+        name = attributes[@position]
+        val = parent.spec.send(name)
+        res = case @spec.type_of(name)
+              when :array
+                msg = "#{name.to_s.capitalize}(Split by ',')"
+                (parent.input msg, val.join(",")).strip.split(",")
+              when :bool
+                !val
+              when :string
+                parent.input name.to_s.capitalize, val
+              end
+        if name == :dependencies
+          parent.spec.dependencies.clear
+          res.each {|dep| parent.spec.add_runtime_dependency dep}
+        else
+          parent.spec.send("#{name}=", res)
+        end
+        parent.message "Updated '#{name}'"
+        @changed = true
+      end
+
+      def show_attribute(name, highlight)
+        val = @spec.send(name)
+
+        # star
+        attron(highlight ? ::Curses::A_UNDERLINE : 0)
+        addstr " * "
+        addstr name.to_s
+        key_width = name.to_s.size
+
+        # required
+        if Gem::Specification.required_attribute?(name) and val.nil?
+          attron(color(:required)){ addstr " (required)" }
+          key_width += 11
+        end
+
+        # padding + separator
+        addstr " ".rjust(@key_width - key_width + 1)
+
+        # value
+        case val
+        when Array
+          addstr val.join(", ")
+        else
+          addstr val.to_s
+        end unless val.nil?
+
+        attroff(highlight ? ::Curses::A_UNDERLINE : 0)
+      end
+    end
+
+    module Usage
+      def draw
+        clear
+        setpos(0, 0)
+        attron(color(:usage)) do
+          addstr " q) Quit, s) Save, b) Build the gem, h) Help".ljust(maxx)
+        end
+        refresh
+      end
+    end
+
+    class IncludedFiles < DelegateClass(::Curses::Window)
+      def initialize(files)
+        @files = files
+        window = ::Curses.stdscr
+        window.clear
+        super(window.subwin(window.maxy, window.maxx, 0, 0))
+        draw
+        getch
+        close
+        MAIN_WINDOW.draw
+      end
+
+      def draw
+        setpos(0, 0)
+        standout
+        addstr "Manifest(included files)".center(maxx)
+        standend
+        @files.each_with_index do |file, idx|
+          setpos(idx+1, 0)
+          addstr file
+        end
+        refresh
+      end
+    end
+
+  end
+end
+

data/rtask.gemspec

@@ -0,0 +1,38 @@
+Gem::Specification.new do |s|
+  s.name = %q{rtask}
+  s.version = "010"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Keita Yamaguchi"]
+  s.date = %q{2008-07-11}
+  s.email = %q{keita.yamaguchi@gmail.com}
+  s.files = ["History.txt", "README.txt", "License.txt", "Rakefile", "bin/rtask", "lib/rtask.rb", "lib/rtask/gem.rb", "lib/rtask/spec.rb", "lib/rtask/ui.rb", "lib/rtask/ui/curses.rb", "rtask.gemspec", "setup.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/keita/rtask/tree/master}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rtask}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{RTask handles tasks for releasing gem packages.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<cursesx>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyforge>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
+      s.add_runtime_dependency(%q<termios>, [">= 0"])
+    else
+      s.add_dependency(%q<cursesx>, [">= 0"])
+      s.add_dependency(%q<rubyforge>, [">= 0"])
+      s.add_dependency(%q<rubyzip>, [">= 0"])
+      s.add_dependency(%q<termios>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<cursesx>, [">= 0"])
+    s.add_dependency(%q<rubyforge>, [">= 0"])
+    s.add_dependency(%q<rubyzip>, [">= 0"])
+    s.add_dependency(%q<termios>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtask
 version: !ruby/object:Gem::Version 
-  version: 009
+  version: "010"
 platform: ruby
 authors: 
 - Keita Yamaguchi
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-22 00:00:00 +09:00
+date: 2008-07-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: gemify
+  name: cursesx
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,17 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: termios
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,8 +54,8 @@ dependencies:
     version: 
 description: 
 email: keita.yamaguchi@gmail.com
-executables: 
-- rtask
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -54,6 +67,11 @@ files:
 - Rakefile
 - bin/rtask
 - lib/rtask.rb
+- lib/rtask/gem.rb
+- lib/rtask/spec.rb
+- lib/rtask/ui.rb
+- lib/rtask/ui/curses.rb
+- rtask.gemspec
 - setup.rb
 has_rdoc: true
 homepage: http://github.com/keita/rtask/tree/master
@@ -77,9 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rtask
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: RTask provides useful Rake tasks for releasing gem packages.
+summary: RTask handles tasks for releasing gem packages.
 test_files: []