machine_setup 0.0.2 → 0.1.0

data/Rakefile

@@ -5,13 +5,16 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "machine_setup"
-    gem.executables = ["setup_config_gen"]
+    gem.executables = %W{setup_config_gen setup_init_dsl setup_analyze_dat}
+    gem.default_executable = gem.executables.first 
     gem.summary = %Q{Generating configuration for machine setup parameters.}
     gem.description = %Q{Helps generating configuration files for machine setup parameters.}
     gem.email = "robi-wan@suyu.de"
     gem.homepage = "http://github.com/robi-wan/machine_setup"
     gem.authors = ["robi-wan"]
-    gem.add_runtime_dependency "i18n", ">= 0.3.2"
+    gem.add_runtime_dependency "i18n", ">= 0.3.3"
+    gem.add_runtime_dependency "ini", ">= 0.1.1"
+    gem.add_runtime_dependency "erubis", ">= 2.6.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/{setup.rb → bin/setup_analyze_dat}

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'pp'
 
 setup_file_name=ARGV[0].gsub(/\\/,"/")

data/bin/setup_init_dsl

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+begin
+  legacy_data_folder=ARGV[0]
+  machine_name=ARGV[1]
+  machine_abbreviation=ARGV[2]
+
+  raise RuntimeError.new("Missing argument: directory with legacy definition") if legacy_data_folder.nil?
+  raise RuntimeError.new("Wrong argument: directory '#{legacy_data_folder}' with legacy definition not found") unless File.directory?(legacy_data_folder)
+
+  raise RuntimeError.new("Missing argument: machine name") unless machine_name
+
+
+  $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+  require 'setup_configuration'
+
+  importer=SetupConfiguration::Legacy::Importer.new(legacy_data_folder, machine_name, machine_abbreviation)
+  importer.output
+
+  puts("#{File.basename(__FILE__)} completed.")
+rescue Exception => e
+  #puts("Error, program will exit => #{e}!")
+  puts(e.message)
+  #puts(e.backtrace().join("\n"))
+  exit(1)
+
+end

data/examples/underleaver/underleaver.setup.param

@@ -13,6 +13,7 @@ SetupConfiguration :underleaver, :ul do
 
   category :common do
     param :underleaver_config, 1
+    param :distance_photo_sensor_from_start, 9
     param :distance_photo_sensor, 2
     param :distance_blade_to_sheet_drive, 3
     param :distance_sheet_drive_to_sheet_exit, 4
@@ -42,6 +43,9 @@ SetupConfiguration :underleaver, :ul do
     param :factor_activation_point_roll_bracket, 23 do
       depends_on :roll_bracket_active
     end
+
+    param :decrease_simulated_portions, 24
+    param :length_correction_first_sheet_after_insert_sheet, 25
   end
 
   category :drives do

data/examples/underleaver/underleaver.setup.param.de.yml

@@ -25,7 +25,11 @@ de:
 
   distance_photo_sensor:
     name:  "Weg Lichtschranke bis Blattaustritt"
-    comment:  "Abstand der Lichtschranke vom Blattaustritt."
+    comment:  "Abstand der Lichtschranke vom Blattaustritt. [mm]"
+
+  distance_photo_sensor_from_start:
+    name:   "Weg Bandbeginn bis Lichtschranke"
+    comment:  "Abstand der Lichtschranke vom Bandbeginn. [mm]"
 
   distance_blade_to_sheet_drive:
     name: "Weg Schneide bis Blattantrieb"
@@ -135,7 +139,34 @@ de:
               
               
               Standardm��ig wird die Rollenbremse unterhalb des unteren Teachpunktes des T�nzers aktiviert. Sollte ein h�herer Aktivierungspunkt notwendig sein, kann �ber diesen Parameter ein Prozentwert angegeben werden, um den der Aktivierungspunkt in Richtung des oberen Teachpunktes des T�nzers verschoben wird. Der Prozentwert bezieht sich auf den Abstand zwischen unteren und oberen Teachpunkt.              
-    
+
+
+  decrease_simulated_portions:
+    name:   "Faktor f�r Verringerung der simulierten Portionen"
+    comment: |
+            Faktor, der die Anzahl der simulierten Portionen in der Betriebsart Simulation verringert.
+            Dieser Faktor wird verwendet bei der Berechnung des Abstandes zwischen zwei Portionen.
+            Da die Berechnung der simulierten Portionen von der eingestellten Blattl�nge und der Bandgeschwindigkeit abh�ngt,
+            wirkt sich der Faktor unterschiedlich aus.
+
+
+            Mit einem Wert von 0 wird die maximale Anzahl von Portionen simuliert.
+            Der eingegebene Wert wird als Zahl mit einer Nachkommastelle vom Programm verarbeitet:
+            aus der Eingabe 25 wird programmintern 2,5.
+            Eine Erh�hung des Wertes um 10 kann (in Abh�ngigkeit von Blattl�nge und Bandgeschwindigkeit)
+            zu einer Reduktion der simulierten Portionen zwischen 10 und 20 Prozent f�hren.
+
+  length_correction_first_sheet_after_insert_sheet:
+    name: "L�ngenkorrektur f�r erstes Blatt nach 'Papier einlegen' [mm]"
+    comment:  |
+          Korrekturwert f�r die L�nge des ersten Blattes nach dem Papier einlegen.
+          Wenn die L�nge des ersten Blattes nach dem Papier einlegen um einen
+          konstanten Wert abweichen sollte, kann �ber diesen Parameter die fehlende L�nge
+          eingegeben werden - anschlie�end wird dieser Korrekturwert beim Positionieren
+          der Folie nach dem Papier einlegen verwendet.
+
+          Der Wert wird in Millimeter angegeben.
+
   paper_roll_drive_selection:
     name:  "Bahnantrieb abgew�hlt=0/Servo=1/FU=2"
     comment: &COMMON_DRIVE_CONFIG | 

data/examples/underleaver/underleaver.setup.param.en.yml

@@ -22,11 +22,17 @@ en:
               1xx: The controller simulates all drives."
 
   distance_photo_sensor:
-    name:  "Distance of photo sensor"
+    name:  "Distance of photo sensor to paper exit"
     comment:  "Configuration of photo sensor.\n
               \n
                 X: Describes the distance [mm] from photo sensor to the paper exit."
 
+  distance_photo_sensor_from_start:
+    name:   "Distance of photo sensor from start"
+    comment:  "Configuration of photo sensor.\n
+              \n
+                X: Describes the distance [mm] to photo sensor from start of transport conveyor."
+
   distance_blade_to_sheet_drive:
     name:  "Distance of blade"
     comment:  "Configuration of Blade\n
@@ -139,6 +145,30 @@ en:
              
              If active, roll brake will be activated beneath lower loop position. This parameter allows to move this activation point towards the upper loop position. Movement is given in percent and relates to the distance between lower and upper loop position.
 
+  decrease_simulated_portions:
+    name:   "Factor for reduction of simulated portions"
+    comment: |
+            This parameter configures a factor which can decrease simulated portions.
+            This factor is used for calculation the distance between two simulated portions.
+            This factor differently influences the count of simulated portions because
+            the calculation of simulated portions depends on sheet length and conveyor velocity.
+
+
+            With a value of 0 the maximum number of portions will be simulated.
+            The given value will be interpreted as decimal with one decimal place:
+            value 25 will be interpreted as 2.5.
+            Increasing this parameter by 10 can (depending on sheet length and conveyor velocity)
+            reduce the number of simulated portions between 10 and 20 percent.
+
+  length_correction_first_sheet_after_insert_sheet:
+    name: "Length correction for first sheet after 'Insert Paper' [mm]"
+    comment:  |
+          Correction for length of first sheet after insert paper.
+          A constant length difference of first sheet after insert paper can be compensated with this value.
+          Subsequent 'insert paper' operations will use this correction value for sheet positioning.
+
+          Value is given in millimeter.
+
   paper_roll_drive_selection:
     name:  "Paper roll drive - Select/Deselect"
     comment: &COMMON_DRIVE_CONFIG "Unit�s Place: 'Select/Deselect drive'\n

data/lib/setup_configuration/legacy/category.rb

@@ -0,0 +1,22 @@
+module SetupConfiguration
+
+  module Legacy
+
+    class Category
+      include Enumerable
+
+      attr_accessor :number
+      attr_accessor :name
+      attr_accessor :parameter
+
+      def initialize()
+        @parameter = []
+      end
+
+      def <=>(parameter)
+        self.number <=> parameter.number
+      end
+
+    end
+  end
+end

data/lib/setup_configuration/legacy/importer.rb

@@ -0,0 +1,255 @@
+
+module SetupConfiguration
+
+  module Legacy
+
+    class Importer
+
+      INI_LINE_SPLIT_PATTERN=','
+
+      attr_reader :categories
+
+      def initialize(folder, name, abbreviation)
+        @folder=folder
+        @name=name
+        @abbreviation=abbreviation
+        @mps3 = ::IniFile.load( File.join(@folder, 'mps3.ini'))
+        @settings = SetupConfiguration::Setting.new
+        @categories=[]
+        @languages=[]
+        @ini_files=Hash.new { |hash, key| hash[key] = ::IniFile.load( File.join(@folder, key), :comment => ';//') }
+        init_settings()
+        init_params()
+      end
+
+      def output(output_path=@folder)
+        output_param(output_path)
+        @languages.each() {|lang| output_language(output_path, lang)}
+      end
+
+      def output_language(output_path, lang)
+        context = LanguageContext.new(@name, lang, self)
+
+        template=File.join(File.dirname(__FILE__), "templates", "setup.param.language.yml.erb")
+        input = File.read(template)
+        eruby = Erubis::Eruby.new(input)
+        
+        File.open(File.join(output_path, context.output ), "w") do |f|
+          f << eruby.evaluate(context)
+        end
+
+      end
+
+      def output_param(output_path)
+        template=File.join(File.dirname(__FILE__), "templates", "setup.param.erb")
+        input = File.read(template)
+        eruby = Erubis::Eruby.new(input)
+        
+        File.open(File.join(output_path, "#{@name}.#{SetupConfiguration::Translation::FILE_EXTENSION}" ), "w") do |f|
+          f << eruby.result(binding())
+        end
+
+      end
+
+      def compute_machine_types(binary)
+        # 60.to_s(2).chars.to_a.reverse.each_with_index { |s,i| puts s; puts i}
+        result=[]
+        if binary.eql?(0) then
+          result << machine_type_by_number(binary).name
+        else
+          Fixnum.induced_from(binary).to_s(2).chars.to_a.reverse.each_with_index do |value, index|
+            if value.eql?("1")
+              result << machine_type_by_number(index+1).name
+            end
+          end
+        end
+        result.join(" + ")
+      end
+
+      def machine_type_by_number(number)
+        @settings.machine_types.select() {|mt| mt.sequence_number.eql?(number)}.first
+      end
+
+      def init_settings()
+        @settings.min(Range.new(sv('BEGIN_MIN'), sv('END_MIN')))
+        @settings.max(Range.new(sv('BEGIN_MAX'), sv('END_MAX')))
+        @settings.balance_min(Range.new(sv('BEGIN_WAAG_MIN'), sv('END_WAAG_MIN')))
+        @settings.balance_max(Range.new(sv('BEGIN_WAAG_MAX'), sv('END_WAAG_MAX')))
+
+        #machine types
+        machine_types = @mps3['MASCHINENTYP']
+        machine_type_regexp=/BEGIN_TYP(\d\d?)/
+        machine_types.each do |k,v|
+          number=k.scan(machine_type_regexp).flatten.first.to_i
+          @settings.machine_type("machine_type_#{number}".to_sym, number, v.to_i)
+        end
+
+        @settings.machine_types.each_with_index do |mt, index|
+          ending=mt.range + 999
+          if @settings.machine_types[index + 1]
+            ending = @settings.machine_types[index + 1].range - 1
+          end
+          #mt.range=Range.new(mt.range, ending)
+          # this is really ugly
+          mt.instance_variable_set( :@range, Range.new(mt.range, ending))
+        end
+
+        # languages
+        lang = @mps3['SPRACHE']
+        lang.each() do |k,v|
+          if k =~ /SPRACHE\d\d?/
+            @languages << v
+          end
+        end
+
+      end
+
+      def setting_value(key)
+        minmax = @mps3['MINMAXWERTE']
+        minmax[key].to_i
+      end
+      alias :sv :setting_value
+
+
+      #todo preserve original parameter order
+      def init_params()
+        params = @mps3['PARAMANZEIGE']
+        params.each do |key, value|
+          cat_regexp = /TAB((\d\d?)([abc]))/
+          if key =~ cat_regexp then
+            unless value.empty?
+              cat_level=key.scan(cat_regexp).flatten[0]
+              cat_number=key.scan(cat_regexp).flatten[1].to_i
+
+              deps = param_dependencies(params, "#{cat_level}")
+              types = machine_types(params, "#{cat_level}")
+
+              cat = category_by_number(cat_number)
+              value.split(INI_LINE_SPLIT_PATTERN).each_with_index do |param_number, index|
+
+                #check for multiple defined parameters (in different categories)
+                #warn and skip
+                if param_by_number(param_number) then
+                  puts("WARNING: parameter '#{ param_key(param_number)}' with number '#{param_number}' multiple defined. Duplicate found in category '#{category_name(cat_number)}' will be skipped.")
+                else
+                  parameter = Parameter.new(param_number)
+                  parameter.depends_on(deps[index])
+                  parameter.for_machine_type(types[index].to_i)
+                  parameter.key = param_key(param_number)
+                  cat.parameter << parameter
+                end
+              end
+              
+            end
+          end
+        end
+
+        # replace parameter numbers with parameter keys
+        parameters.each() do |param|
+          p = param_by_number(param.dependency)
+          param.depends_on(p ? p.key : :none)
+        end
+
+        #get categorie names
+        self.categories.each do |cat|
+          cat.name = category_name(cat.number)
+        end
+
+      end
+
+      # TODO extract into module
+      def category_name_raw(lang, cat_number)
+        ini= @ini_files["#{lang.downcase}.lng"]
+        ini[lang.downcase]["TAB#{cat_number}"]
+      end
+
+      # TODO extract into module
+      # Get the name of the category with the given number. Name is escaped and ready to use as a symbol
+      # Language defaults to 'deutsch'.
+      def category_name(number)
+        key=category_name_raw('deutsch', number)
+        # ensure uniqueness of category names so that they do not clash with parameter names
+        # otherwise comments for parameters get lost (categories have no comments)
+        "cat_#{escape(key)}"
+      end
+
+      def escape(key)
+        key=key.gsub(/[^a-z���A-Z���0-9\s]/, '')
+        key=key.gsub('�', 'ae')
+        key=key.gsub('�', 'oe')
+        key=key.gsub('�', 'ue')
+        key=key.gsub('�', 'Ae')
+        key=key.gsub('�', 'Oe')
+        key=key.gsub('�', 'Ue')
+        key=key.gsub('�', 'ss')
+        key=key.split(' ').collect(){|splitter| splitter.downcase }
+        #remove leading numbers
+        #TODO this just works if first element is a number - extend for all leading elements...
+        if key.first.to_i.to_s.eql?(key.first) then
+          key.shift
+        end
+        
+        key.join('_').to_sym
+      end
+
+      def param_name(lang, param_number)
+        filename = "#{lang.downcase}.lng"
+        key_ini= @ini_files[filename]
+        key_ini[lang.downcase]["PARAM#{param_number}"]
+      end
+
+      def param_key(param_number)
+        key=param_name('deutsch', param_number)
+        #delete unwanted characters
+        escape(key)
+      end
+
+      def parameter_description(lang, param_number)
+        #determine number in description file name
+        file_number=1
+        SetupConfiguration.description_ranges().each_with_index() do |range, index|
+          file_number= index + 1 if range.include?(param_number.to_i)
+        end
+
+        filename = lang.downcase << file_number.to_s << ".lng"
+        key_ini= @ini_files[filename]
+        desc=key_ini[lang.upcase]["HILFEPARAM#{param_number}"]
+        escape_param_description(desc)
+      end
+
+      def escape_param_description(description)
+        description unless description.eql?("not used")
+      end
+
+      def parameters
+         @categories.collect(){|cat| cat.parameter }.flatten
+      end
+
+      def param_by_number(number)
+        self.parameters().select(){|p| p.number.eql?(number)}.first
+      end
+
+      def category_by_number(number)
+        cat = self.categories.select(){|cat| cat.number.eql?(number)}.first
+        unless cat then
+          cat = Category.new
+          cat.number = number
+          self.categories << cat
+        end
+        cat
+      end
+
+      # key = 2CF#{level}
+      def param_dependencies(params, level)
+        params["2CF#{level}"].split(INI_LINE_SPLIT_PATTERN)
+      end
+      
+      # key = 1CF#{level}
+      def machine_types(params, level)
+        params["1CF#{level}"].split(INI_LINE_SPLIT_PATTERN)
+      end
+
+    end
+
+  end
+end

data/lib/setup_configuration/legacy/language_context.rb

@@ -0,0 +1,39 @@
+module SetupConfiguration
+
+  module Legacy
+
+    class LanguageContext
+
+      attr_reader :lang_abbr
+      attr_reader :output
+
+      def initialize(name, lang, helper)
+        @lang=lang
+        @helper=helper
+        @lang_abbr= SetupConfiguration::Translation.language_abbreviation(lang)
+        @output = SetupConfiguration::Translation.translation_files(name).select(){|file| file.include?(@lang_abbr.to_s)}.first
+      end
+
+      def category_name(cat)
+        @helper.category_name_raw(@lang, cat)
+      end
+
+      def parameter_name(param)
+        @helper.param_name(@lang, param)
+      end
+
+
+      def parameter_description(param)
+      #TODO escape ($$ into \n)
+        @helper.parameter_description(@lang, param.to_i)
+      end
+
+      def categories
+        @helper.categories.sort
+      end
+
+    end
+
+  end
+
+end

data/lib/setup_configuration/legacy/legacy.rb

@@ -0,0 +1,7 @@
+
+require 'inifile'
+
+require File.expand_path(File.dirname(__FILE__) + '/parameter')
+require File.expand_path(File.dirname(__FILE__) + '/category')
+require File.expand_path(File.dirname(__FILE__) + '/language_context')
+require File.expand_path(File.dirname(__FILE__) + '/importer')

data/lib/setup_configuration/legacy/parameter.rb

@@ -0,0 +1,26 @@
+module SetupConfiguration
+
+  module Legacy
+
+    class Parameter < SetupConfiguration::Parameter
+      def initialize(number)
+        @number=number
+      end
+
+      def extended?
+        dep? || type?
+      end
+
+      def dep?
+        @dependency != :none
+      end
+
+      def type?
+        @machine_type != 0
+      end
+
+    end
+    
+  end
+end
+    

data/lib/setup_configuration/legacy/templates/setup.param.erb

@@ -0,0 +1,32 @@
+SetupConfiguration :<%= @name.to_sym %>, :<%= @abbreviation.to_sym %> do
+
+  setting do
+    min <%= @settings.minimum %>
+    max <%= @settings.maximum %>
+    balance_min <%= @settings.balance_minimum %>
+    balance_max <%= @settings.balance_maximum %>
+    <% for type in @settings.machine_types %>
+    machine_type :<%= type.name.to_sym %>, <%= type.sequence_number %>, <%= type.range %>
+    <% end %>
+  end
+
+  <% for cat in @categories.sort %>
+  category :<%= cat.name %> do
+    <% for param in cat.parameter %>
+    param :<%= param.key %>, <%= param.number %><% if param.extended? %> do
+    <% if param.dep? %>
+      depends_on :<%= param.dependency %>
+    <% end %>
+    <% if param.type? %>
+      for_machine_type <%= compute_machine_types(param.machine_type) %>
+    <% end %>
+    end
+    <% else %>
+    
+    <% end %>
+    <% end %>
+  end
+  
+  <% end %>
+
+end

data/lib/setup_configuration/legacy/templates/setup.param.language.yml.erb

@@ -0,0 +1,13 @@
+<%= lang_abbr %>:
+
+  <% for cat in categories %>
+  <%= cat.name %>:
+    name:       "<%= category_name(cat.number) %>"
+
+    <% for param in cat.parameter %>
+  <%= param.key %>:
+    name:       "<%= parameter_name(param.number) %>"
+    comment:    "<%= parameter_description(param.number) %>"
+
+    <% end %>
+  <% end %>

data/lib/setup_configuration/setup_config.rb

@@ -50,7 +50,8 @@ class SetupConfiguration::Suite
 
   # Gets all known parameters.
   def parameters()
-    categories.values.flatten.sort
+    # cache parameters so sorting is necessary only once - this saves a lot of time...
+    @parameters ||= categories.values.flatten.sort
   end
 
   #
@@ -88,8 +89,8 @@ class SetupConfiguration::Suite
     
     keys=[]
     numbers=[]
-    #valid parameter numbers start at 1
-    valid_param_numbers=Range.new(SetupConfiguration.parameter_range().first()+1, SetupConfiguration.parameter_range().last)
+    # slicer contains parameter with number 0... therefore valid parameter numbers starts at 0
+    valid_param_numbers=SetupConfiguration.parameter_range()
 
     self.parameters().each() do |p|
 

data/lib/setup_configuration/suite_generator.rb

@@ -35,14 +35,16 @@ module SetupConfiguration::Generator
       @lang=lang
       @parameter_range=range
       @output=output
+      @translator = SetupConfiguration::Translation::Translator.new()
     end
 
     def lang_name
       SetupConfiguration::Translation.language_name(lang)
     end
 
+
     def cat_name(key)
-      name, desc=SetupConfiguration::Translation::Translator.new().translate(key, @lang)
+      name, desc=@translator.translate(key, @lang)
       name
     end
 
@@ -61,7 +63,7 @@ module SetupConfiguration::Generator
       p=self.suite.find_param_by_number(number)
       if p
         key=p.key
-        translation = SetupConfiguration::Translation::Translator.new().translate(key, @lang)
+        translation = @translator.translate(key, @lang)
         if extractor
           extractor.call( *translation )
         else
@@ -85,7 +87,6 @@ module SetupConfiguration::Generator
 
   class MPSTemplateBinding < TemplateBinding
 
-
     def languages
       SetupConfiguration::Translation.language_names.values
     end
@@ -104,7 +105,7 @@ module SetupConfiguration::Generator
       end
       #TODO compute value for max_number_parameters_per_tab of value maximum_numbers_per_category
       max_number_parameters_per_tab=50
-      [depends, machine_type, number].collect(){ |arr| (arr%(max_number_parameters_per_tab)) .collect(){|a| prepare(a)}}
+      [depends, machine_type, number].collect(){ |arr| (arr%(max_number_parameters_per_tab)).collect(){|a| prepare(a)}}
     end
 
     :private
@@ -194,37 +195,37 @@ end
 
 
 class SetupConfiguration::SetupCodeBinding < SetupConfiguration::Generator::TemplateBinding
-  
+
   def initialize
     super
   end
-  
+
   def parameters
     suite.parameters
   end
-  
+
   #
   # Offset for setup parameter numbers. This offset is added to a parameter number when evaluated in controller.
   #
   def parameter_offset
     1300
   end
-  
+
   def key(symbol)
     s=symbol.to_s
     delimiter='_'
     s.split(delimiter).collect(){|splitter| splitter.capitalize}.join(delimiter).ljust(longest_key_length)
   end
-  
+
   :private
 
   def longest_key_length
     # find the length of the longest word
     unless @longest
-     longest = parameters.inject(0) do |memo,param|
+      longest = parameters.inject(0) do |memo, param|
         memo >= param.key.to_s.length ? memo : param.key.to_s.length
-     end
-     @longest=longest + 5
+      end
+      @longest=longest + 5
     end
     @longest
   end
@@ -236,9 +237,9 @@ class SetupConfiguration::SetupCodeGenerator
     setup_code=SetupConfiguration::SetupCodeBinding.new
     setup_code.output="LOGCODE#{suite.name.to_s.upcase}SETUP.EXP"
     setup_code.suite=suite
-    
+
     if template then
-      rhtml = ERB.new( template, nil, "<>")
+      rhtml = Erubis::Eruby.new( template )
 
       File.open(File.join(output_path, setup_code.output), "w") do |f|
         f << rhtml.result(setup_code.get_binding)
@@ -246,11 +247,12 @@ class SetupConfiguration::SetupCodeGenerator
     else
       puts "WARNING: No template found. Generation of #{setup_code.output} aborted."
     end
-    
-    
+
+
   end
-  
+
   :private
+
   def template
     template=File.join(File.dirname(__FILE__), "templates", "logcodesetup.exp.erb")
     if File.file?(template)
@@ -259,7 +261,7 @@ class SetupConfiguration::SetupCodeGenerator
       puts "WARNING: Template file #{template} expected but not found"
     end
   end
-  
+
 end
 
 
@@ -283,7 +285,7 @@ class SetupConfiguration::SuiteGenerator
 
     description_bindings().each() do |bind|
       bind.suite=self.suite
-      rhtml = ERB.new(description_template, nil, "<>")
+      rhtml = Erubis::Eruby.new(description_template)
 
       File.open(File.join(output_path, bind.output), "w") do |f|
         f << rhtml.result(bind.get_binding)
@@ -298,7 +300,7 @@ class SetupConfiguration::SuiteGenerator
       bind.suite=self.suite
       template = parameter_template(bind.lang_name())
       if template then
-        rhtml = ERB.new( template, nil, "<>")
+        rhtml = Erubis::Eruby.new(template)
 
         File.open(File.join(output_path, bind.output), "w") do |f|
           f << rhtml.result(bind.get_binding)
@@ -312,7 +314,7 @@ class SetupConfiguration::SuiteGenerator
     bind.suite=self.suite
     mps_template=mps_template()
     if mps_template then
-      rhtml = ERB.new( mps_template, nil, "<>")
+      rhtml = Erubis::Eruby.new(mps_template)
 
       File.open(File.join(output_path, bind.output), "w") do |f|
         f << rhtml.result(bind.get_binding)
@@ -322,7 +324,6 @@ class SetupConfiguration::SuiteGenerator
     end
 
     SetupConfiguration::SetupCodeGenerator.new.generate(self.suite, output_path)
-    
   end
 end
 

data/lib/setup_configuration/templates/deutsch.lng.erb

@@ -1,8 +1,13 @@
 [<%= lang_name %>]
 //Parametertexte
-<% parameter_range.each do |number| %>PARAM<%= number%>=<%= name(number)%><%= "\r\n" %><% end %>
+<% parameter_range.each do |number| %>
+PARAM<%= number%>=<%= name(number)%>
+<% end %>
+
 //Texte Tabelle/Registerkarte
-<% categories.each_with_index do |category, index| %>TAB<%= index%>=<%= cat_name(category)%><%= "\r\n" %><% end %>
+<% categories.each_with_index do |category, index| %>
+TAB<%= index%>=<%= cat_name(category)%>
+<% end %>
 
 //�berschriften Spalten
 COL0=Parameter

data/lib/setup_configuration/templates/english.lng.erb

@@ -1,8 +1,13 @@
 [<%= lang_name %>]
 //Parametertexte
-<% parameter_range.each do |number| %>PARAM<%= number%>=<%= name(number)%><%= "\r\n" %><% end %>
+<% parameter_range.each do |number| %>
+PARAM<%= number%>=<%= name(number)%>
+<% end %>
+
 //Texte Tabelle/Registerkarte
-<% categories.each_with_index do |category, index| %>TAB<%= index%>=<%= cat_name(category)%><%= "\r\n" %><% end %>
+<% categories.each_with_index do |category, index| %>
+TAB<%= index%>=<%= cat_name(category)%>
+<% end %>
 
 //�berschriften Spalten
 COL0=Parameter

data/lib/setup_configuration/templates/logcodesetup.exp.erb

@@ -7,7 +7,8 @@ TYPE LogCode<%= suite.name.to_s.capitalize %>Setup :
    Edit instead the machine setup parameter description. *)
 
 <% parameters.each do | parameter | %>
-    SUP_<%= suite.abbreviation.to_s.upcase %>_<%= key(parameter.key) %>:= <%= parameter.number + parameter_offset %><% unless parameters.last.eql?(parameter) then %><%= "," %><% end %><% end %>
+    SUP_<%= suite.abbreviation.to_s.upcase %>_<%= key(parameter.key) %>:= <%= parameter.number + parameter_offset %><% unless parameters.last.eql?(parameter) then %><%= "," %><% end %>
+<% end %>
 
 );
 END_TYPE

data/lib/setup_configuration/templates/mps3.ini.erb

@@ -4,8 +4,10 @@ DRUCK=0
 DATKONVERT=0
 
 [SPRACHE]
-AKTUELL=0<% languages.each_with_index do | language_name, index| %>
-SPRACHE<%= index %>=<%= language_name.upcase %><% end %>
+AKTUELL=0
+<% languages.each_with_index do | language_name, index| %>
+SPRACHE<%= index %>=<%= language_name.upcase %>
+<% end %>
 
 [MINMAXWERTE]
 BEGIN_MIN=<%= settings.minimum.first %>
@@ -17,12 +19,16 @@ END_WAAG_MIN=<%= settings.balance_minimum.last %>
 BEGIN_WAAG_MAX=<%= settings.balance_maximum.first %>
 END_WAAG_MAX=<%= settings.balance_maximum.last %>
 
-[MASCHINENTYP]<% settings.machine_types.each do |machine_type| %>
-BEGIN_TYP<%= machine_type.sequence_number %>=<%= machine_type.range.first %><% end %>
+[MASCHINENTYP]
+<% settings.machine_types.each do |machine_type| %>
+BEGIN_TYP<%= machine_type.sequence_number %>=<%= machine_type.range.first %>
+<% end %>
 
 ;(0..16)
 ;generate param names as comment
-[PARAMANZEIGE]<%  categories.each_with_index do |category, index| %><% dependencies, machine_types, parameters = param_infos(category) %>
+[PARAMANZEIGE]
+<%  categories.each_with_index do |category, index| %>
+    <% dependencies, machine_types, parameters = param_infos(category) %>
 2CF<%= index%>a=<%= dependencies[0] %>
 1CF<%= index%>a=<%= machine_types[0] %>
 TAB<%= index%>a=<%= parameters[0] %>
@@ -31,4 +37,5 @@ TAB<%= index%>a=<%= parameters[0] %>
 TAB<%= index%>b=<%= parameters[1] %>
 2CF<%= index%>c=<%= dependencies[2] %>
 1CF<%= index%>c=<%= machine_types[2] %>
-TAB<%= index%>c=<%= parameters[2] %><% end %>
+TAB<%= index%>c=<%= parameters[2] %>
+<% end %>

data/lib/setup_configuration/translation.rb

@@ -17,6 +17,10 @@ module SetupConfiguration::Translation
     language_names()[lang]
   end
 
+  def self.language_abbreviation(lang_name)
+    language_names.invert()[lang_name.downcase]
+  end
+
   def self.language_names()
     {:de => "deutsch", :en => "english"}
   end

data/lib/setup_configuration.rb

@@ -15,7 +15,7 @@ end
 
 require 'pp'
 require 'singleton'
-require 'erb'
+require 'erubis'
 require 'fileutils'
 require 'i18n'
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/array')
@@ -23,3 +23,5 @@ require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/paramete
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/setup_config')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/suite_generator')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/translation')
+
+require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/legacy/legacy')

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: machine_setup
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+    - 0
+    - 1
+    - 0
+  version: 0.1.0
 platform: ruby
 authors: 
   - robi-wan
@@ -9,23 +14,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-03-29 00:00:00 +02:00
 default_executable: setup_config_gen
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: i18n
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+              - 3
+            version: 0.3.3
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: ini
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 1
+              - 1
+            version: 0.1.1
     type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: erubis
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.3.2
-      version: 
+            segments: 
+              - 2
+              - 6
+              - 5
+            version: 2.6.5
+    type: :runtime
+    version_requirements: *id003
 description: Helps generating configuration files for machine setup parameters.
 email: robi-wan@suyu.de
 executables: 
   - setup_config_gen
+  - setup_init_dsl
+  - setup_analyze_dat
 extensions: []
 
 extra_rdoc_files: 
@@ -39,12 +78,21 @@ files:
   - Rakefile
   - TODO
   - VERSION
+  - bin/setup_analyze_dat
   - bin/setup_config_gen
+  - bin/setup_init_dsl
   - examples/underleaver/underleaver.setup.param
   - examples/underleaver/underleaver.setup.param.de.yml
   - examples/underleaver/underleaver.setup.param.en.yml
   - lib/setup_configuration.rb
   - lib/setup_configuration/array.rb
+  - lib/setup_configuration/legacy/category.rb
+  - lib/setup_configuration/legacy/importer.rb
+  - lib/setup_configuration/legacy/language_context.rb
+  - lib/setup_configuration/legacy/legacy.rb
+  - lib/setup_configuration/legacy/parameter.rb
+  - lib/setup_configuration/legacy/templates/setup.param.erb
+  - lib/setup_configuration/legacy/templates/setup.param.language.yml.erb
   - lib/setup_configuration/parameter_machinetype_bridge.rb
   - lib/setup_configuration/setup_config.rb
   - lib/setup_configuration/suite_generator.rb
@@ -53,7 +101,6 @@ files:
   - lib/setup_configuration/templates/logcodesetup.exp.erb
   - lib/setup_configuration/templates/mps3.ini.erb
   - lib/setup_configuration/translation.rb
-  - setup.rb
   - test/setup_configuration/machine_type_test.rb
   - test/setup_configuration/parameter_test.rb
   - test/setup_configuration/setup_configuration_test.rb
@@ -71,18 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+          - 0
         version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generating configuration for machine setup parameters.