davetron5000-gliffy 0.1.1 → 0.1.2

data/README.rdoc

@@ -50,3 +50,21 @@ If you are not on OS X, you will want to configure two other options, and you ca
 [<tt>open_url</tt>] Configures the command for opening an url from the command line.  This should be a string of the form <tt>command %s</tt> where <tt>%s</tt> will be replaced with the name of the url to open.
 
 The other options are all documented in Gliffy::Config.  Note that your most previously received user token is stored here as well, to keep from getting it every time the client is run.
+
+=== Example
+
+    > gliffy ls
+    1573119 Deployment Artifacts
+    1569470 Monthly_Eligible
+    1569477 Monthly_Ineligibile
+    1569478 Quarterly_Eligible
+    1569479 Quarterly_Ineligibile
+    > gliffy get 1569479
+    Quarterly_Ineligibile.jpg
+    > gliffy get 1569479 -d ~/Downloads -t png
+    /Users/davec/Downloads/Quarterly_Ineligibile.png
+    > gliffy edit 1569470
+    # You are sent to gliffy.com in your browser to edit that diagram
+    > gliffy new -e "Class Diagram"
+    # You are sent to gliffy.com to edit the new diagram 
+

data/lib/gliffy/commands/commands.rb

@@ -55,9 +55,11 @@ end
 
 desc 'Download a diagram as an image to a file'
 usage <<eos 
-[-v version_num] [-f filename] [-t image_type] diagram_id
+[-v version_num] [-f filename] [-d download_dir] [-t image_type] diagram_id
 
-   image_type can be :jpeg, :png, :svg, or :xml
+   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|
 
@@ -67,12 +69,15 @@ command :get do |gliffy,args|
   version_number = options['v'].to_i if options['v']
   filename = options['f'] if options['f']
   type = options['t'].to_sym if options['t']
-  type = :jpeg if !type
+  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 = "#{diagram_id}_v#{version_number}.#{type.to_s}"
+      filename = "#{dir}/#{filename}_v#{version_number}.#{type.to_s}"
     else
-      filename = "#{diagram_id}.#{type.to_s}"
+      filename = "#{dir}/#{filename}.#{type.to_s}"
     end
   end
 
@@ -97,19 +102,17 @@ end
 
 desc 'Create a new diagram'
 usage <<eos
-[-e] diagram_name
+[-t template_id] diagram_name
 
-  -e edit the diagram after creating it
+  -t specify the id of a diagram to server as the initial revision
 eos
 command :new do |gliffy,args|
-  edit = args[0] == '-e'
-  args.shift if edit
-  diagram = gliffy.create_diagram(args[0])
-  if edit
-    Gliffy::Command.commands[:edit].run [diagram.id]
-  else
-    puts "#{diagram.name} created with id #{diagram.id}"
-  end
+  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'

data/lib/gliffy/{gliffy.rb → handle.rb}

@@ -167,8 +167,8 @@ module Gliffy
       ""
     end
 
-    # GliffyDiagram getDiagramMetaData (integer $diagramId)
-    def get_diagram_meta_data(diagram_id)
+    # Returns a Diagram with the diagram's meta data filled in.
+    def get_diagram_metadata(diagram_id)
       params = {'diagramId' => diagram_id}
       diagrams = do_simple_rest(:get,'diagrams',"Getting meta data for diagram #{diagram_id}",params)
       diagrams[0]

data/lib/gliffy.rb

@@ -1 +1 @@
-require 'gliffy/gliffy'
+require 'gliffy/handle'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gliffy
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Copeland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2009-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ files:
 - lib/gliffy/config.rb
 - lib/gliffy/diagram.rb
 - lib/gliffy/folder.rb
-- lib/gliffy/gliffy.rb
+- lib/gliffy/handle.rb
 - lib/gliffy/response.rb
 - lib/gliffy/rest.rb
 - lib/gliffy/url.rb