gemify 0.2.3 → 0.2.4

data/bin/gemify

@@ -1,12 +1,45 @@
 #!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__)+"/../lib"
+
+require 'gemify'
+require 'optparse'
+
+options = {}
+options[:interactive] = true # Interactive by default
+
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{opts.program_name} [options]"
+  opts.separator ""
+  opts.separator "Options:"
+  opts.on("-h", "--help",  "Shows this message") do |val|
+    $stdout.puts opts
+    exit(0)
+  end
+  opts.on("-I", "--no-interactive", "Automaticically builds the gem") do |val|
+    options[:interactive] = false
+  end
+  opts.on("-c", "--from-vcs", "Use files from version control system" ) do |val|
+    options[:vcs] = true
+  end
+end
+
 begin
-  require 'gemify'
-rescue LoadError
-  require 'lib/gemify'
+  parser.parse!(ARGV)
+rescue => e
+  $stderr.puts "Error: #{e.message}"
+  $stdout.puts parser
+  exit -1
 end
 
 begin
-  Gemify.new.main
+  gemify = Gemify.new
+  gemify.from_vcs = !!options[:vcs]
+  if not options[:interactive] and File.exist?(Gemify::SETTINGS)
+    gemify.build!
+  else
+    gemify.main
+  end
 rescue Gemify::Exit
   exit
-end
+end

data/bin/gemify-manifest

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__)+"/../lib"
+
+require 'gemify'
+
+manifest = (ARGV.first || ".manifest")
+
+$stdout.puts "=> Generating #{manifest}"
+File.open(manifest, "w") do |file|
+  file << Gemify::VCS.files.join("\n")
+end

data/lib/gemify.rb

@@ -2,37 +2,53 @@ require 'rubygems'
 require 'rubygems/builder'
 require 'yaml'
 
+require 'gemify/vcs'
+
 class Gemify
+  attr_accessor :from_vcs
+  
   class Exit < StandardError;end
+  SETTINGS = ".gemified"
   MANIFEST = ["MANIFEST", "Manifest.txt", ".manifest"]
   REQUIRED = [:name, :summary, :version]
-  OPTIONAL = [:author, :email, :homepage, :rubyforge_project, :dependencies]
+  OPTIONAL = [:author, :email, :homepage, :rubyforge_project, :has_rdoc, :dependencies]
   ALL = REQUIRED+OPTIONAL
-  REPLACE = {:rubyforge_project => "RubyForge project"}
+  REPLACE = {
+    :rubyforge_project => "RubyForge project",
+    :has_rdoc => "documentation",
+  }
+  TYPE = {
+    :has_rdoc => :boolean,
+    :dependencies => :array,
+  }
+  
   def initialize
     @settings = {}
-    @bin = Dir["bin/**/*"]
-    
-    if files.empty?
-      puts "Can't find anything to make a gem out of..."
-      raise Exit
-    end
-    
-    if File.exists? ".gemified"
-      @settings = YAML.load(open(".gemified"))
+    @from_vcs = false
+
+    if File.exists? SETTINGS
+      load!
     end
-  rescue Errno::EACCES
-    @result = "Can't read .gemified"
   end
   
   def files
-    @files ||= if m=MANIFEST.detect{|x|File.exist?(x)}
+    @files ||= if @from_vcs
+      VCS.files
+    elsif m=MANIFEST.detect{|x|File.exist?(x)}                 
       File.read(m).split(/\r?\n/)
     else
-      @bin + Dir["lib/**/*"]
+      VCS.files(:unknown)
     end
   end
   
+  def bin
+    files.select { |file| file =~ /^bin\// }
+  end
+  
+  def extensions
+    files.select { |file| file =~ /extconf\.rb$/ }
+  end
+  
   def main
     loop do
       menu
@@ -41,34 +57,22 @@ class Gemify
       l=(o=gets).downcase[0]
       i=o.to_i
       
-      if l==?x
-        puts "Exiting..."
+      case l
+      when ?x
         raise Exit
-      end   
-      
-      if l==?b
-        build
-      end
-      
-      if (1..ALL.length-1).include? i
-        sub_task(i)
-        next
-      end
-      
-      case i-(ALL.length-1)
-      when 1
-        puts "Write all your dependencies here, split by ENTER and"
-        puts "press ENTER twice when you're done:"
-        @settings[:dependencies] = $stdin.gets($/*2).strip.split($/)
-        @settings.delete(:dependencies) if @settings[:dependencies].empty?
-        @result = "Updated 'dependencies'"
-        next
-      when 2
-        save
+      when ?b
+        build!
+      when ?s
+        save!
         next
-      when 3
+      when ?i
         @result = "Included files:#{$/}" + files.join($/)
         next
+      end      
+      
+      if (1..ALL.length).include? i
+        set(ALL[i-1])
+        next
       end
       
       @result = "Can't find the task named '#{o}'"
@@ -76,6 +80,7 @@ class Gemify
   end
   
   def menu
+    require_files!
     clear
     puts "Welcome to Gemify!"
     puts
@@ -83,8 +88,9 @@ class Gemify
     ALL.each do |m|
       puts build_task(m)
     end
-    puts "#{ALL.length+1}) Save"
-    puts "#{ALL.length+2}) Show included files"
+    puts
+    puts "s) Save"
+    puts "i) Show included files"
     puts
     puts "b) Build gem"
     puts "x) Exit"
@@ -93,7 +99,8 @@ class Gemify
   
   ## Special tasks
   
-  def build
+  def build!
+    require_files!
     Gem::Builder.new(Gem::Specification.new do |s|
       (@settings.delete(:dependencies)||[]).each do |dep|
         s.add_dependency dep
@@ -105,47 +112,73 @@ class Gemify
       s.bindir = "bin"
       s.require_path = "lib"
 
-      unless @bin.empty?
-        s.executables = @bin.map{|x|x[4..-1]}
+      unless bin.empty?
+        s.executables = bin.map{|x|x[4..-1]}
       end
+      
+      unless extensions.empty?
+        s.extensions = extensions
+      end
+      
     end).build
     raise Exit
   end
   
-  def save
-    File.open(".gemified","w"){|f|f<<YAML.dump(@settings)}
+  def load!
+    @settings = YAML.load(File.read(SETTINGS))
+    @settings.keys.each do |key|
+      @settings[key] = value(key)
+    end
+  rescue Errno::EACCES
+    @result = "Can't read #{SETTINGS}"
+  end
+  
+  def save!
+    File.open(SETTINGS,"w"){|f|f << YAML.dump(@settings)}
     @result = "Saved!"
   rescue Errno::EACCES
-    @result = "Can't write to .gemified"
+    @result = "Can't write to #{SETTINGS}"
   end  
   
-  def sub_task(i)
-    key = ALL[i-1]
-    menu
-    @settings[key] = gets(key)
-    @settings.delete(key) if @settings[key].empty?
-    @result = "Updated '#{show(key)}'"
-  end
-  
-  # Helpers
-  private
   def build_task(m)
     index = (ALL.index(m)||0)+1
-    verb,now = if @settings.keys.include?(m)
-      ["Change"," = " + inspect_setting(m)]
+    unless type(m) == :boolean
+      verb,now = if @settings.keys.include?(m)
+        ["Change"," = " + inspect_setting(m)]
+      else
+        ["Set",""]
+      end
     else
-      ["Set",""]
+      verb, now = ["Toogle"," = " + inspect_setting(m)]
     end
     req = REQUIRED.include?(m) ? " (required)" : ""
     "#{index}) #{verb} #{show(m)}#{req}#{now}"
   end
   
   def clear
-    print "\e[H\e[2J"
+    system("cls") || print("\e[H\e[2J")
+  end
+  
+  def set(m)
+    menu
+    case type(m)
+    when :array
+      puts "Split by ENTER and press ENTER twice when you're done"
+      puts "> #{show(m).capitalize}: "
+      @settings[m] = $stdin.gets($/*2).strip.split($/)
+      @settings.delete(m) if @settings[m].empty?
+    when :boolean
+      @settings[m] = !@settings[m]
+    when :string
+      print "> #{show(m).capitalize}: "
+      @settings[m] = $stdin.gets.strip
+      @settings.delete(m) if @settings[m].empty?
+    end
+    @result = "Updated '#{m}'"
   end
   
-  def gets(m=nil)
-    print m ? "> #{show(m).capitalize}: " : "> "
+  def gets
+    print("> ")
     $stdin.gets.strip
   end
   
@@ -153,12 +186,39 @@ class Gemify
     REPLACE[m]||m.to_s
   end
   
+  def type(m)
+    TYPE[m]||:string
+  end
+  
+  def value(m)
+    i=@settings[m]
+    case type(m)
+    when :array
+      i.to_a
+    when :boolean
+      !!i
+    when :string
+      i.to_s
+    end
+  end
+  
   def inspect_setting(m)
-    case i=@settings[m]
-    when Array
+    i=@settings[m]     
+    case type(m)
+    when :array
       i.join(", ")
-    else
+    when :boolean
+      (i||false).to_s
+    when :string
       i.to_s
     end
   end
-end
+  
+  protected
+  def require_files!
+    if files.empty?
+      puts "Can't find anything to make a gem out of..."
+      raise Exit
+    end
+  end
+end

data/lib/gemify/vcs.rb

@@ -0,0 +1,58 @@
+
+require 'open3'
+
+class Gemify
+
+class VCS
+  def self.determine_vcs
+    vcs = :unknown
+    if File.exist?(".git")
+      vcs = :git
+    elsif File.exist?("_darcs")
+      vcs = :darcs
+    elsif File.exist?(".hg")
+      vcs = :hg
+    elsif File.exist?(".bzr")
+      vcs = :bzr
+    elsif File.exist?(".svn")
+      vcs = :svn
+    elsif File.exist?("CVSROOT")
+      vcs = :cvs
+    end
+    
+    vcs
+  end
+  
+  def self.get_files_from_command(command)
+    files = []
+    
+    Open3.popen3(command) do |stdin, stdout, stderr|
+      stdout.each { |line|
+        file = line.strip
+        files << file if File.exist?(file)
+      }
+    end
+    files
+  end
+  
+  def self.files(forced_vcs = false)
+    case (forced_vcs || determine_vcs)
+    when :git
+      get_files_from_command("git-ls-files").delete_if { |w| w == ".gitignore" or w == ".gitattributes" }
+    when :darcs
+      get_files_from_command("darcs query manifest")
+    when :bzr
+      get_files_from_command("bzr ls").delete_if { |w| w == ".bzrignore" }
+    when :hg
+      get_files_from_command("hg manifest")
+    when :svn
+      get_files_from_command("svn ls")
+    when :cvs
+      get_files_from_command("cvs ls")
+    when :unknown
+      Dir['bin/*'] + Dir['lib/**/**']    
+    end
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemify
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Magnus Holm
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-23 00:00:00 +01:00
+date: 2008-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -17,12 +17,16 @@ description:
 email: judofyr@gmail.com
 executables: 
 - gemify
+- gemify-manifest
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/gemify
+- bin/gemify-manifest
+- lib/gemify
+- lib/gemify/vcs.rb
 - lib/gemify.rb
 has_rdoc: false
 homepage: http://dojo.rubyforge.org
@@ -46,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dojo
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: An extremely simple way to create a RubyGem