davetron5000-gliffy 0.1.2 → 0.1.3

data/bin/gliffy

@@ -4,5 +4,24 @@ $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
 $: << File.expand_path(File.dirname(__FILE__) + '/../ext') 
 
 require 'gliffy/cli'
+require 'rubygems'
+require 'gli'
+include GLI
 
-Gliffy::Command.execute(ARGV)
+pre do |global_options,command,options,args|
+  if !Gliffy::CLIConfig.instance.load
+    raise "Problem loading config"
+  end
+  if command && command.name != :help
+    previous_token = Gliffy::CLIConfig.instance.config[:current_token]
+    Gliffy::Config.config.log_level = Logger::DEBUG if global_options[:v]
+    $gliffy = Gliffy::Handle.new(Gliffy::CLIConfig.instance.config[:username],previous_token)
+  end
+end
+
+desc 'be more verbose'
+switch :v
+
+require 'gliffy/commands'
+
+GLI.run(ARGV)

data/lib/gliffy/cli.rb

@@ -7,78 +7,6 @@ require 'logger'
 module Gliffy
   extend self
 
-  # A command line option to the gliffy command line client
-  class Command
-
-    # Global flags
-    GLOBAL_FLAGS = {
-      '-v' => 'be more verbose (overrides config)',
-    }
-    
-    # Global access to all configured commands
-    def self.commands
-      @@commands ||= {}
-    end
-
-    def self.aliases
-      @@aliases ||= {}
-    end
-
-    # The name of the command
-    attr_reader :name
-    # a short description
-    attr_reader :description
-    # a usage statement
-    attr_reader :usage
-
-    # Create a new command
-    #
-    # [+name+] the name of the command (should be short, no spaces)
-    # [+description+] short description of the command
-    # [+offline+] true if this command doesn't require a connection to Gliffy
-    # [+usage+] usage statement
-    # [+block+] A block that represents the command itself.  This block will take  the gliffy handle and the args array as arguments *or* just the arguments if it is an "offline"
-    # command
-    def initialize(name,description,offline,usage,block)
-      @name = name
-      @description = description
-      @block = block
-      @offline = offline
-      @usage = usage ? usage : ""
-    end
-
-    # Runs the command with the given arguments
-    def run(args)
-      if (@offline)
-        @block.call(args)
-      else
-        previous_token = CLIConfig.instance.config[:current_token]
-        handle = Gliffy::Handle.new(CLIConfig.instance.config[:username],previous_token)
-        @block.call(handle,args)
-        CLIConfig.instance.config[:current_token] = handle.current_token
-        CLIConfig.instance.save
-      end
-    end
-
-    # Executes the command line that was given
-    def self.execute(argv)
-      globals = Hash.new
-      command = argv.shift
-      while !command.nil? && (command =~ /^-/) && !argv.empty?
-        globals[command] = true
-        command = argv.shift
-      end 
-      Gliffy::Config.config.log_level = Logger::DEBUG if globals['-v']
-      cmd = Gliffy::Command.commands[command.to_sym]
-      if cmd
-        cmd.run argv
-      else
-        puts "Unknown command #{command}"
-        Gliffy::Command.commands[:help].run []
-      end
-    end
-  end
-
   # Represents the configuration for the command line client.
   # This is a singleton
   class CLIConfig
@@ -192,69 +120,9 @@ module Gliffy
 
   end
 
-  # For defining commands, this specifies the description of the next command defined
-  def desc(description)
-    @next_desc = description
-  end
-
-  # For defining commands, this specifies if the next defined command is "offline"
-  def offline(bool)
-    @next_offline = bool
-  end
-
-  # For defining commands, specifies the usage statement of the next command
-  def usage(usage='')
-    @next_usage = usage
-  end
-
-  # defines a command.  The only options supported is ":aliases" which is an array of aliases
-  # for the command
-  def command(name,options={},&block)
-    Command.commands[name] = Command.new(name,@next_desc,@next_offline,@next_usage,block)
-    if options[:aliases]
-      options[:aliases].each() do |a|
-        Command.commands[a] = Command.commands[name]
-        Command.aliases[a] = true
-      end
-    end
-    @next_usage = nil
-    @next_offline = false
-    @next_desc = nil
-  end
-
-  def parse_options(args)
-    options = Hash.new
-    return options if !args
-    i = 0
-    while i < args.length
-      inc = 2
-      if args[i] =~ /^-/
-        arg = args[i].gsub(/^-/,'')
-        if !args[i+1] || (args[i+1] =~ /^-/)
-          inc = 1
-          options[arg] = true
-        else
-          options[arg] = args[i+1]
-        end
-      else
-        break
-      end
-      i += inc
-    end
-    i.times { args.shift }
-    options
-  end
-
   def format_date(date)
     date.strftime('%m/%d/%y %H:%M')
   end
 
 end
 
-include Gliffy
-require 'gliffy/commands/commands'
-if !CLIConfig.instance.load
-  exit -1
-end
-
-

data/lib/gliffy/commands.rb

@@ -0,0 +1,6 @@
+require 'gliffy/commands/list'
+require 'gliffy/commands/delete'
+require 'gliffy/commands/url'
+require 'gliffy/commands/get'
+require 'gliffy/commands/edit'
+require 'gliffy/commands/new'

data/lib/gliffy/commands/delete.rb

@@ -0,0 +1,10 @@
+desc 'Delete a diagram'
+arg_name 'diagram_id [diagram_id]*'
+command [:delete,:del,:rm] do |c|
+  c.action do |global_options,options,args|
+    raise UnknownArgumentException("diagram id is required") if args.length == 0;
+    args.each do |diagram_id|
+      $gliffy.delete_diagram(diagram_id)
+    end
+  end
+end

data/lib/gliffy/commands/edit.rb

@@ -0,0 +1,19 @@
+desc 'Edit a diagram'
+arg_name 'diagram_id'
+command :edit do |c|
+
+  c.action do |global_options,options,args|
+
+    raise(UnknownArgumentException,'You must specify one diagram id') if args.length != 1
+
+    return_link = $gliffy.get_diagram_as_url(args[0])
+    link = $gliffy.get_edit_diagram_link(args[0],return_link,"Done")
+    if CLIConfig.instance.config[:open_url]
+      system(sprintf(CLIConfig.instance.config[:open_url],link.full_url))
+    else
+      puts "Nothing configured for #{:open_url.to_s} to open the url"
+      puts link.full_url
+    end
+  end
+end
+

data/lib/gliffy/commands/get.rb

@@ -0,0 +1,46 @@
+desc 'Download a diagram as an image to a file'
+arg_name 'diagram_id [diagram_id]*'
+command :get do |c|
+
+  c.desc 'Get a specific version number'
+  c.arg_name 'version_number'
+  c.default_value nil
+  c.flag [:v,:version]
+
+  c.desc 'Specify the filename'
+  c.arg_name 'filename'
+  c.default_value nil
+  c.flag [:f,:filename]
+
+  c.desc 'Specify the image type (one of jpeg, jpg, png, svg, xml)'
+  c.arg_name 'type'
+  c.default_value 'jpg'
+  c.flag [:t,:type,:"image-type"]
+
+  c.action do |global_options,options,args|
+
+    raise(UnknownArgumentException,'You must specify a diagram id') if args.length == 0
+    raise(MissingArgumentException,'You may not specify a filename when getting multiple diagrams') if args.length > 1 and options[:f]
+    args.each do |diagram_id|
+
+      version_number = options[:v]
+      filename = options[:f]
+      type = options[:t].to_sym
+      if !filename
+        dir = options['d'] || '.'
+        metadata = $gliffy.get_diagram_metadata(diagram_id)
+        filename = metadata.name.gsub(/[\s\/\-\+\$]/,'_')
+        if version_number
+          filename = "#{dir}/#{filename}_v#{version_number}.#{type.to_s}"
+        else
+          filename = "#{dir}/#{filename}.#{type.to_s}"
+        end
+      end
+
+      get_options = { :mime_type => type, :file => filename }
+      get_options[:version] = version_number if version_number
+      $gliffy.get_diagram_as_image(diagram_id,get_options)
+      puts filename
+    end
+  end
+end

data/lib/gliffy/commands/list.rb

@@ -0,0 +1,27 @@
+desc 'List all diagrams in the account'
+command [:list,:ls] do |c|
+ 
+  c.desc 'List long form'
+  c.switch :l
+
+  c.action do |global_options,options,args|
+    diagrams = $gliffy.get_diagrams
+    if options[:l]
+      max = diagrams.inject(0) { |max,diagram| diagram.name.length > max ? diagram.name.length : max }
+      diagrams.sort.each do |diagram|
+        printf "%8d %s %-#{max}s %-3d %s  %s %s\n",
+        diagram.id,
+          diagram.is_public? ? "P" : "-",
+          diagram.name,
+          diagram.num_versions,
+          format_date(diagram.create_date),
+          format_date(diagram.mod_date),
+          diagram.owner_username
+      end
+    else
+      printf_string = "%d %s\n"
+      diagrams.sort.each { |diagram| printf printf_string,diagram.id,diagram.name }
+    end
+  end
+end
+

data/lib/gliffy/commands/new.rb

@@ -0,0 +1,25 @@
+desc 'Create a new diagram'
+arg_name 'new_diagram_name'
+command [:new,:create] do |c|
+  c.desc 'use the given diagram_id as a template'
+  c.default_value nil
+  c.flag [:t,:template]
+
+  c.desc 'don\'t edit the new diagram'
+  c.switch [:n,:"no-edit"]
+
+  c.action do |global_options,options,args|
+
+    raise(UnknownArgumentException,'You must specify the diagram name') if args.length != 1
+
+    template_id = options[:t]
+
+    diagram = $gliffy.create_diagram(args[0],template_id)
+    if options[:n]
+      puts "Diagram #{diagram.name} created with id #{diagram.id}"
+    else
+      GLI.run(['edit',diagram.id.to_s])
+    end
+  end
+end
+

data/lib/gliffy/commands/url.rb

@@ -0,0 +1,21 @@
+desc 'Get the URL for a diagram as an image image'
+arg_name 'diagram_id'
+command :url do |c|
+  c.desc 'Open URL with configured :open_url command'
+  c.switch [:o,:open]
+  c.action do |global_options,options,args|
+    raise UnknownArgumentException,"diagram id is required" if args.length == 0
+    raise UnknownArgumentException,"Only one diagram id is supported" if args.length > 1
+    url = $gliffy.get_diagram_as_url(args[0])
+    if options[:o]
+      if CLIConfig.instance.config[:open_image]
+        system(sprintf(CLIConfig.instance.config[:open_image],url))
+      else
+        puts "Nothing configured for #{:open_image.to_s} to open the image"
+        puts url
+      end
+    else
+      puts url
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gliffy
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - David Copeland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: davetron5000-gli
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.4
+    version: 
 description: 
 email: davidcopeland@naildrivin5.com
 executables: 
@@ -31,9 +40,16 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - ext/array_has_response.rb
+- bin/gliffy
 - lib/gliffy/account.rb
 - lib/gliffy/cli.rb
-- lib/gliffy/commands/commands.rb
+- lib/gliffy/commands/delete.rb
+- lib/gliffy/commands/edit.rb
+- lib/gliffy/commands/get.rb
+- lib/gliffy/commands/list.rb
+- lib/gliffy/commands/new.rb
+- lib/gliffy/commands/url.rb
+- lib/gliffy/commands.rb
 - lib/gliffy/config.rb
 - lib/gliffy/diagram.rb
 - lib/gliffy/folder.rb
@@ -43,7 +59,6 @@ files:
 - lib/gliffy/url.rb
 - lib/gliffy/user.rb
 - lib/gliffy.rb
-- bin/gliffy
 - README.rdoc
 has_rdoc: true
 homepage: http://davetron5000.github.com/gliffy

data/lib/gliffy/commands/commands.rb

@@ -1,152 +0,0 @@
-desc 'List all diagrams in the account'
-usage <<eos
-[-l]
-
-  -l - show all information
-eos
-command :list, :aliases => [:ls] do |gliffy,args|
-  diagrams = gliffy.get_diagrams
-  options = parse_options(args)
-  if options['l']
-    max = diagrams.inject(0) { |max,diagram| diagram.name.length > max ? diagram.name.length : max }
-    diagrams.sort.each do |diagram|
-      printf "%8d %s %-#{max}s %-3d %s  %s %s\n",
-        diagram.id,
-        diagram.is_public? ? "P" : "-",
-        diagram.name,
-        diagram.num_versions,
-        format_date(diagram.create_date),
-        format_date(diagram.mod_date),
-        diagram.owner_username
-    end
-  else
-    printf_string = "%d %s\n"
-    diagrams.sort.each { |diagram| printf printf_string,diagram.id,diagram.name }
-  end
-end
-
-desc 'Delete a diagram'
-usage 'diagram_id'
-command :delete, :aliases => [:del,:rm] do |gliffy,args|
-  gliffy.delete_diagram(args[0])
-end
-
-desc 'Get the URL for an image'
-usage <<eos
-[-o] diagram_id
-
-  -o - open diagram's URL with configured :open_url command
-eos
-command :url do |gliffy,args|
-  open = args[0] == '-o'
-  args.shift if open
-  url = gliffy.get_diagram_as_url(args[0])
-  if open
-    if CLIConfig.instance.config[:open_image]
-      system(sprintf(CLIConfig.instance.config[:open_image],url))
-    else
-      puts "Nothing configured for #{:open_image.to_s} to open the image"
-      puts url
-    end
-  else
-    puts url
-  end
-end
-
-desc 'Download a diagram as an image to a file'
-usage <<eos 
-[-v version_num] [-f filename] [-d download_dir] [-t image_type] diagram_id
-
-   image_type can be :jpeg, :jpg, :png, :svg, or :xml
-   if no filename specified, uses the diagram's name
-   if -d and -f are specified, -d is ignored
-eos
-command :get do |gliffy,args|
-
-  options = parse_options(args)
-  diagram_id = args.shift
-
-  version_number = options['v'].to_i if options['v']
-  filename = options['f'] if options['f']
-  type = options['t'].to_sym if options['t']
-  type = :jpg if !type
-  if !filename
-    dir = options['d'] || '.'
-    metadata = gliffy.get_diagram_metadata(diagram_id)
-    filename = metadata.name.gsub(/[\s\/\-\+\$]/,'_')
-    if version_number
-      filename = "#{dir}/#{filename}_v#{version_number}.#{type.to_s}"
-    else
-      filename = "#{dir}/#{filename}.#{type.to_s}"
-    end
-  end
-
-  get_options = { :mime_type => type, :file => filename }
-  get_options[:version] = version_number if version_number
-  gliffy.get_diagram_as_image(diagram_id,get_options)
-  puts filename
-end
-
-desc 'Edit a diagram'
-usage 'diagram_id'
-command :edit do |gliffy,args|
-  return_link = gliffy.get_diagram_as_url(args[0])
-  link = gliffy.get_edit_diagram_link(args[0],return_link,"Done")
-  if CLIConfig.instance.config[:open_url]
-    system(sprintf(CLIConfig.instance.config[:open_url],link.full_url))
-  else
-    puts "Nothing configured for #{:open_url.to_s} to open the url"
-    puts link.full_url
-  end
-end
-
-desc 'Create a new diagram'
-usage <<eos
-[-t template_id] diagram_name
-
-  -t specify the id of a diagram to server as the initial revision
-eos
-command :new do |gliffy,args|
-  options = parse_options(args)
-  name = args.shift
-  template_id = options['t']
-
-  diagram = gliffy.create_diagram(name,template_id)
-  Gliffy::Command.commands[:edit].run [diagram.id]
-end
-
-desc 'Show commands'
-offline true
-usage 'command'
-command :help do |args|
-  if args[0]
-    command = Command.commands[args[0].to_sym]
-    if command
-      printf "%s - %s\n",args[0],command.description
-      printf "usage: %s %s\n",args[0],command.usage
-    else
-      puts "No such command #{args[0]}"
-    end
-  else
-    command_string = "   %-6s   %s %s\n"
-    puts 'usage: gliffy [global_options] command [command_options]'
-    puts 'global_options:'
-    Command::GLOBAL_FLAGS.keys.sort.each do |flag|
-      printf command_string,flag,Command::GLOBAL_FLAGS[flag],''
-    end
-    puts
-    puts 'command:'
-    command_names = Command.commands.keys.sort { |a,b| a.to_s <=> b.to_s }
-    command_names.each() do |name|
-      command = Command.commands[name]
-      if !Command.aliases[name]
-        aliases = Array.new
-        Command.aliases.keys.each() do |a| 
-          aliases << a if Command.commands[a] == command 
-        end
-        alias_string = '(also: ' + aliases.join(',') + ')' if aliases.length > 0
-        printf command_string,name.to_s, command.description,alias_string
-      end
-    end
-  end
-end