xamplr-gen 1.9.4 → 1.9.5

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_development_dependency "cucumber", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 
-    gem.add_dependency('xamplr', '>=1.9.2')
+    gem.add_dependency('xamplr', '>=1.9.3')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.9.4
+1.9.5

data/lib/xamplr-gen/xampl-cl-gen.rb

@@ -98,7 +98,7 @@ _EOF_
       mappings << [ ns, module_name, "ns#{ count }" ]
     end
 
-    text =  @@specialisation_file_content.gsub(/{{MAPPING}}/) do 
+    text =  @@specialisation_file_content.gsub(/{{MAPPING}}/) do
       insert = []
       mappings.each do | ns, module_name, prefix |
         insert << "            ['#{ ns }', '#{ module_name }', '#{ prefix }'],"
@@ -132,9 +132,12 @@ _EOF_
 #      Xampl.set_default_persister_format(:xml_format)
 
     dirname = self.directory
+    
+=begin
+
     if File.directory? dirname then
       begin
-      FileUtils.rm_rf([ dirname ])
+        FileUtils.rm_rf([ dirname ])
       rescue => e
         puts "could not clean up #{ dirname } -- #{ e }"
         return
@@ -144,6 +147,8 @@ _EOF_
       return
     end
 
+=end
+
     Xampl.transaction("project-generation") do
 
       options = Options.new do | opts |
@@ -162,80 +167,82 @@ _EOF_
       end
 
       generator = Generator.new('generator')
-      generator.go(:options => options,
-                   :filenames => filenames,
-                   :directory => directory)
-
-      puts generator.print_elements(print_base_filename, print_options)
-      self.write_specialisation_file(generator.elements_map)
-
-      generated_files = Dir.glob("#{ self.directory }/*.rb")
-      if 0 < generated_files.size then
-        all = []
-        #abs = []
-        generated_files.each do | filename |
-          all << "require \"\#\{ File.dirname __FILE__ \}/#{ File.basename(filename, '.rb') }\""
-          #all << "require '#{ File.dirname(filename)[2..-1] }/#{ File.basename(filename, '.rb') }'"
-          #abs_filename = File.expand_path(filename)
-          #abs << "require '#{ File.dirname(abs_filename) }/#{ File.basename(abs_filename, '.rb') }'"
-        end
+      okay = generator.go(:options => options,
+                          :filenames => filenames,
+                          :directory => directory)
+
+      if okay
+        puts generator.print_elements(print_base_filename, print_options)
+        self.write_specialisation_file(generator.elements_map)
+
+        generated_files = Dir.glob("#{ self.directory }/*.rb")
+        if 0 < generated_files.size then
+          all = []
+          #abs = []
+          generated_files.each do | filename |
+            all << "require \"\#\{ File.dirname __FILE__ \}/#{ File.basename(filename, '.rb') }\""
+            #all << "require '#{ File.dirname(filename)[2..-1] }/#{ File.basename(filename, '.rb') }'"
+            #abs_filename = File.expand_path(filename)
+            #abs << "require '#{ File.dirname(abs_filename) }/#{ File.basename(abs_filename, '.rb') }'"
+          end
 
-        out_filename = "#{ self.directory }/all.rb"
-        File.open(out_filename, 'w') do | out |
-          out.puts all.join("\n")
-        end
-        puts "WRITE TO FILE: #{ out_filename }"
-
-        #out_filename = "#{ self.directory }/all-absolute.rb"
-        #File.open(out_filename, 'w') do | out |
-        #  out.puts abs.join("\n")
-        #end
-        #puts "WRITE TO FILE: #{ out_filename }"
-
-        if File.exists?('./generated.yuml') && (cl_options[:download_yuml_png] || cl_options[:download_yuml_pdf]) then
-          diagram = ""
-          File.open("./generated.yuml") do | f |
-            f.each do | line |
+          out_filename = "#{ self.directory }/all.rb"
+          File.open(out_filename, 'w') do | out |
+            out.puts all.join("\n")
+          end
+          puts "WRITE TO FILE: #{ out_filename }"
+
+          #out_filename = "#{ self.directory }/all-absolute.rb"
+          #File.open(out_filename, 'w') do | out |
+          #  out.puts abs.join("\n")
+          #end
+          #puts "WRITE TO FILE: #{ out_filename }"
+
+          if File.exists?('./generated.yuml') && (cl_options[:download_yuml_png] || cl_options[:download_yuml_pdf]) then
+            diagram = ""
+            File.open("./generated.yuml") do | f |
+              f.each do | line |
                 diagram << line.chomp
+              end
             end
-          end
 
 
-          okay = false
-          if cl_options[:download_yuml_png] then
-            begin
-              filename = (true == cl_options[:download_yuml_png]) ?  'generated.png' : cl_options[:download_yuml_png]
-              wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}' -O '#{filename}'"
-              okay = system(wget)
-              if okay then
-                puts "downloaded yuml png"
-              else
-                puts "could not get the yuml png file -- #{ $? }"
+            okay = false
+            if cl_options[:download_yuml_png] then
+              begin
+                filename = (true == cl_options[:download_yuml_png]) ?  'generated.png' : cl_options[:download_yuml_png]
+                wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}' -O '#{filename}'"
+                okay = system(wget)
+                if okay then
+                  puts "downloaded yuml png"
+                else
+                  puts "could not get the yuml png file -- #{ $? }"
+                end
+              rescue => e
+                puts "could not get the yuml png file -- #{ e }"
               end
-            rescue => e
-              puts "could not get the yuml png file -- #{ e }"
             end
-          end
 
-          if cl_options[:download_yuml_pdf] then
-            begin
-              filename = (true == cl_options[:download_yuml_png]) ?  'generated.png' : cl_options[:download_yuml_png]
-              wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}.pdf' -O '#{filename}'"
-              okay = system(wget)
-              puts "downloaded yuml pdf"
-              if okay then
+            if cl_options[:download_yuml_pdf] then
+              begin
+                filename = (true == cl_options[:download_yuml_png]) ?  'generated.png' : cl_options[:download_yuml_png]
+                wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}.pdf' -O '#{filename}'"
+                okay = system(wget)
                 puts "downloaded yuml pdf"
-              else
-                puts "could not get the yuml pdf file -- #{ $? }"
+                if okay then
+                  puts "downloaded yuml pdf"
+                else
+                  puts "could not get the yuml pdf file -- #{ $? }"
+                end
+              rescue => e
+                puts "could not get the yuml pdf file -- #{ e }"
               end
-            rescue => e
-              puts "could not get the yuml pdf file -- #{ e }"
             end
           end
         end
       end
-
       Xampl.rollback
+
     end
   end
 end

data/lib/xamplr-gen/xampl-generator.rb

@@ -211,10 +211,6 @@ module XamplGenerator
     end
 
     def generate(directory_name, params={:verbose => false}, &eval_context)
-      if directory_name then
-        FileUtils.mkdir_p(directory_name) unless File.exist?(directory_name)
-      end
-
       ensure_templates
 
       module_names = Set.new
@@ -244,13 +240,35 @@ module XamplGenerator
           if element.class_name == element.package then
             puts "ERROR: Class #{ element.package } is in a module with the same name -- this NOT going to work"
           elsif module_names.member?(element.class_name)
-            puts "WARNING: a Class and a Module have the same name (#{ element.package }) -- this is highly unlikely to work"
+            puts "WARNING: a Class and a Module have the same name (#{ element.package } or maybe #{ element.class_name }) -- this is highly unlikely to work"
           end
 
           @templates.child_modules(place)
         end
       end
 
+      unless @generated_package_map then
+        puts "Nothing to do. That is, NOTHING is generated. (Are you where you think you are?)"
+        return false
+      end
+
+      if File.directory? directory_name then
+        begin
+          FileUtils.rm_rf([ directory_name ])
+        rescue => e
+          puts "could not clean up #{ directory_name } -- #{ e }"
+          return
+        end
+      elsif File.exists? directory_name then
+        puts "please move #{ directory_name } out of the way of xampl-gen"
+        return
+      end
+
+      if directory_name then
+        FileUtils.mkdir_p(directory_name) unless File.exist?(directory_name)
+      end
+
+
       @elements_map.each do |ns, elements|
         elements.element_child.each do |element|
           place = find_place(directory_name, element.package)
@@ -290,6 +308,7 @@ module XamplGenerator
       end
 
       report_elements if params[:verbose]
+      return true
     end
 
     def report_elements

data/xamplr-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr-gen}
-  s.version = "1.9.4"
+  s.version = "1.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-02-01}
   s.default_executable = %q{xampl-gen}
   s.description = %q{This is the xampl code generator for Ruby.}
   s.email = %q{hutch@xampl.com}
@@ -85,14 +85,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_runtime_dependency(%q<xamplr>, [">= 1.9.2"])
+      s.add_runtime_dependency(%q<xamplr>, [">= 1.9.3"])
     else
       s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<xamplr>, [">= 1.9.2"])
+      s.add_dependency(%q<xamplr>, [">= 1.9.3"])
     end
   else
     s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<xamplr>, [">= 1.9.2"])
+    s.add_dependency(%q<xamplr>, [">= 1.9.3"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr-gen
 version: !ruby/object:Gem::Version 
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -05:00
+date: 2010-02-01 00:00:00 -05:00
 default_executable: xampl-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.2
+        version: 1.9.3
     version: 
 description: This is the xampl code generator for Ruby.
 email: hutch@xampl.com