machine_setup 0.2.0 → 0.3.0

data/lib/setup_configuration/mps_template_binding.rb

@@ -0,0 +1,58 @@
+# encoding: windows-1252
+
+module SetupConfiguration
+
+  module Generator
+
+    class MPSTemplateBinding < TemplateBinding
+
+      def initialize
+        yield self
+      end
+
+      def languages
+        Translation.language_names
+      end
+
+      def settings
+        self.suite.settings
+      end
+
+      def param_infos(category_key)
+        parameters=suite.categories[category_key]
+        depends, machine_type, number=[], [], []
+        parameters.each() do |param|
+          machine_type << param.machine_type
+          number << param.number
+          depends << depends_on(param.dependency)
+        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.in_groups_of(max_number_parameters_per_tab, false)).collect() { |a| prepare(a) } }
+      end
+
+      :private
+
+      def prepare(array)
+        array.join(',')
+      end
+
+      def depends_on(key)
+
+        if :none.eql?(key) then
+          -1
+        else
+          param=suite.find_param(key)
+          if param
+            param.number
+          else
+            $stderr.puts "ERROR: parameter with key '#{key}' not found."
+            # depends on no other parameter
+            -1
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/setup_configuration/parameter_template_binding.rb

@@ -0,0 +1,71 @@
+# encoding: windows-1252
+
+module SetupConfiguration
+
+  module Generator
+
+    class ParameterTemplateBinding < TemplateBinding
+      attr_accessor :lang
+      attr_accessor :parameter_range
+
+      def initialize(lang, range, output)
+        @lang=lang
+        @parameter_range=range
+        @output=output
+        @translator = Translation::Translator.new()
+      end
+
+      def lang_name
+        Translation.language_name(lang)
+      end
+
+
+      def cat_name(cat)
+        name, desc=@translator.translate(cat.name, @lang)
+        $stderr.puts("WARNING: missing translation for key #{@lang}.#{cat.name}.#{Translation::Translator::NAME}") if name.eql?(cat.name.to_s)
+        name
+      end
+
+      def name(number)
+        p_name= translate(number) { |name, desc| name }
+        if find_param_by_number(number) && p_name.eql?(find_param_by_number(number).key.to_s)
+          $stderr.puts("WARNING: missing translation for key #{@lang}.#{find_param_by_number(number).key.to_s}.#{Translation::Translator::NAME}")
+        end
+        p_name.empty? ? "placeholder for mps3.exe" : p_name
+      end
+
+      def description(number)
+        translate(number) do |name, desc|
+          $stderr.puts("WARNING: missing translation for key #{@lang}.#{find_param_by_number(number).key.to_s}.#{Translation::Translator::COMMENT}") if desc.empty?
+          escape(desc)
+        end
+      end
+
+      def translate(number, &extractor)
+        p=find_param_by_number(number)
+        if p
+          key=p.key
+          translation = @translator.translate(key, @lang)
+          if extractor
+            extractor.call(*translation)
+          else
+            translation
+          end
+        else
+          ""
+        end
+      end
+
+      private
+
+      #
+      # Zeilenumbr�che werden mit '��' dargestellt
+      # \302\247 - oktale Darstellung von � (Paragraphenzeichen)
+      #
+      def escape(message)
+        message.gsub(/\n\s?/, '��')
+      end
+
+    end
+  end
+end

data/lib/setup_configuration/setup_code_binding.rb

@@ -0,0 +1,40 @@
+module SetupConfiguration
+
+  class SetupCodeBinding < Generator::TemplateBinding
+
+    def initialize
+      super
+    end
+
+    def parameters
+      #TODO use set or something similar
+      suite.parameters.select() { |p| p.param? }
+    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|
+          memo >= param.key.to_s.length ? memo : param.key.to_s.length
+        end
+        @longest=longest + 5
+      end
+      @longest
+    end
+  end
+end

data/lib/setup_configuration/setup_code_generator.rb

@@ -0,0 +1,24 @@
+# encoding: windows-1252
+
+module SetupConfiguration
+
+  class SetupCodeGenerator
+    include Generator
+
+    def generate(suite, output_path)
+      setup_code=SetupCodeBinding.new
+      setup_code.output="LOGCODE#{suite.name.to_s.upcase}SETUP.EXP"
+      setup_code.suite=suite
+      self.output_path=output_path
+      output(setup_code, template)
+    end
+
+    :private
+
+    def template
+      find_template("logcodesetup.exp.erb")
+    end
+
+  end
+
+end

data/lib/setup_configuration/setup_config.rb

@@ -41,7 +41,7 @@ module SetupConfiguration
         # flatten is needed: Parameters#param returns an array which is inserted in an array...
         categories[cat].flatten!
       else
-        puts "WARNING: Empty category '#{category}' will be ignored. "
+        $stderr.puts "WARNING: Empty category '#{category}' will be ignored. "
       end
     end
 
@@ -111,7 +111,7 @@ module SetupConfiguration
 
       self.parameters().each() do |p|
 
-        puts "WARNING: parameter number 404 is reserved for machine type. you are using it for '#{p.key}'." if p.number.eql?(404)
+        $stderr.puts "WARNING: parameter number 404 is reserved for machine type. you are using it for '#{p.key}'." if p.number.eql?(404)
         throw RuntimeError.new("ERROR: parameter number '#{p.number}' not supported. Number must be in range #{valid_param_numbers}.") unless valid_param_numbers.member?(p.number)
 
         if p.param?
@@ -180,6 +180,7 @@ module SetupConfiguration
       @balance_maximum=range
     end
 
+    #TODO remove range argument
     def machine_type(name, number, range)
       machine_type = MachineType.new(name, number, range)
       @machine_types << machine_type
@@ -228,6 +229,7 @@ module SetupConfiguration
       p = Parameter.new(parameter, number)
       p.instance_eval(&parameter_def) if parameter_def
       params << p
+      p
     end
 
     def param_ref(parameter)
@@ -235,6 +237,34 @@ module SetupConfiguration
       params << p
     end
 
+
+    #
+    # Additional block is allowed, it may contain call for_machine_type and depends_on.
+    # This additional information is applied only to generated parameter
+    # <drive>_selection.
+    # The additional for_machine_type is also applied to other generated parameters.
+    #
+    def drive(drive, number, &parameter_def)
+
+      key = symbol(drive, "drive")
+      drive_selection = symbol(key, "selection")
+
+      drive_param=param(drive_selection, number)
+      drive_param.instance_eval(&parameter_def) if parameter_def
+
+      properties=[%w(distance revolution), %w( gear in ), %w( gear out ), "length", "motortype" ]
+      properties.each_with_index do |prop, index|
+        parameter = param(symbol(key, *prop), number + index + 1) { depends_on drive_selection }
+        parameter.for_machine_type(drive_param.machine_type)
+      end
+
+    end
+
+    :private
+
+    def symbol(*strings)
+      strings.join('_').to_sym
+    end
   end
 
   class Parameter
@@ -316,6 +346,8 @@ module SetupConfiguration
   class MachineType
     include Enumerable
 
+    RANGES = [0..999, 1000..1999, 2000..2499, 2500..2999, 3000..3999, 4000..4999, 5000..5999, 6000..6999].freeze
+
     attr_reader :name
     attr_reader :range
     attr_reader :sequence_number
@@ -323,8 +355,9 @@ module SetupConfiguration
 
     def initialize(name, sequence_number, range)
       @name=name
-      @range=range
+      raise RuntimeError.new("ERROR: More than #{RANGES.length} different machine types are not supported: [name=#{name}] [number=#{sequence_number}]") if sequence_number >= RANGES.length
       @sequence_number=sequence_number
+      @range=RANGES[@sequence_number]
       if @sequence_number <= 0
         @binary_number=0
       else
@@ -339,4 +372,4 @@ module SetupConfiguration
   end
 
 end
-  
+  

data/lib/setup_configuration/suite_generator.rb

@@ -1,332 +1,50 @@
-# encoding: utf-8
+# encoding: windows-1252
 
-module SetupConfiguration::Generator
-  @output_path=""
+module SetupConfiguration
 
-  def output_path
-    @output_path
-  end
-
-  def output_path=(out)
-    @output_path=out
-  end
-
-  class TemplateBinding
+  class SuiteGenerator
+    include Generator
 
     attr_accessor :suite
-    attr_accessor :output
-
-    def categories
-      #TODO maybe cache these values for better performance...?
-      suite.categories.keys().sort()
-    end
-
-    # Support templating of member data.
-    def get_binding
-      binding
-    end
-
-  end
-
-  class ParameterTemplateBinding < TemplateBinding
-    attr_accessor :lang
-    attr_accessor :parameter_range
-
-    def initialize(lang, range, output)
-      @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(cat)
-      name, desc=@translator.translate(cat.name, @lang)
-      name
-    end
-
-    def name(number)
-      p_name= translate(number) { |name, desc| name }
-      p_name.empty? ? "placeholder for mps3.exe" : p_name
-    end
-
-    def description(number)
-      translate(number) do |name, desc|
-        escape(desc)
-      end
-    end
-
-    def translate(number, &extractor)
-      p=self.suite.find_param_by_number(number)
-      if p
-        key=p.key
-        translation = @translator.translate(key, @lang)
-        if extractor
-          extractor.call( *translation )
-        else
-          translation
-        end
-      else
-        ""
-      end
-    end
+    attr_accessor :do_not_run
 
-    private
-
-    #
-    # Zeilenumbr�che werden mit '��' dargestellt
-    # \302\247 - oktale Darstellung von �
-    #
-    def escape(message)
-      message.gsub(/\n\s?/, '��' )
+    def initialize
+      self.do_not_run = false
+      self.suite = Suite.instance
     end
 
-  end
-
-  class MPSTemplateBinding < TemplateBinding
-
-    def languages
-      SetupConfiguration::Translation.language_names.values
+    def self.do_not_run
+      self.do_not_run=true
     end
 
-    def settings
-      self.suite.settings
-    end
+    def generate
+      return "no output" if self.do_not_run
 
-    def param_infos(category_key)
-      parameters=suite.categories[category_key]
-      depends, machine_type, number=[], [], []
-      parameters.each() do |param|
-        machine_type << param.machine_type
-        number << param.number
-        depends << depends_on(param.dependency)
-      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.in_groups_of(max_number_parameters_per_tab, false)).collect(){|a| prepare(a)}}
-    end
+      description_bindings().each() do |bind|
+        bind.suite=self.suite
 
-    :private
-
-    def prepare(array)
-      array.join(',')
-    end
-
-    def depends_on(key)
-
-      if :none.eql?(key) then
-        -1
-      else
-        param=suite.find_param(key)
-        if param
-          param.number
-        else
-          puts "ERROR: parameter with key '#{key}' not found."
-          # depends on no other parameter
-          -1
-        end
+        output(bind, description_template)
       end
-    end
-
-  end
 
-#           [:de, "deutsch", (0..199), "deutsch1.lng"],
-#          [:de, "deutsch", (200..599), "deutsch2.lng"],
-#          [:de, "deutsch", (600..1299), "deutsch3.lng"],
-#          [:en, "english", (0..199), "english1.lng"],
-#          [:en, "english", (200..599), "english2.lng"],
-#          [:en, "english", (600..1299), "english3.lng"],
-  def description_bindings()
-    SetupConfiguration::Translation.languages().collect() do |lang|
-      SetupConfiguration.description_ranges().collect() do |range|
-        # constructs the output file names
-        out= "#{SetupConfiguration::Translation.language_name(lang)}#{SetupConfiguration.description_ranges().index(range)+1}.lng"
-        ParameterTemplateBinding.new(lang, range, out)
+      # extras:
+      # -every PARAMETER key needs a value!
+      # -use Windows line terminators CRLF - \r\n
+      # - do not use []
+      #- output is an INI-file
+      parameter_bindings().each() do |bind|
+        bind.suite=self.suite
+        template = parameter_template(bind.lang_name())
+        output(bind, template)
       end
-    end.flatten()
-  end
-
-  def description_template
-    %q{
-    [<%= lang_name.upcase %>]
-    <% parameter_range.each do |number| %>
-    HILFEPARAM<%= number %>=<%= description(number) %>
-    <% end %>
-  }.gsub(/^\s*/, '')
-  end
-
-  def parameter_bindings()
-    SetupConfiguration::Translation.languages().collect() do |lang|
-      # constructs the output file names
-      out= "#{SetupConfiguration::Translation.language_name(lang)}.lng"
-      ParameterTemplateBinding.new(lang, SetupConfiguration.parameter_range(), out)
-    end
-  end
-
-  def parameter_template(lang)
-    template=File.join(File.dirname(__FILE__), "templates", "#{lang.to_s}.lng.erb")
-    if File.file?(template)
-      File.read(template)
-    else
-      puts "WARNING: Template file #{template} expected but not found"
-    end
-  end
-
-  def mps_template()
-    template=File.join(File.dirname(__FILE__), "templates", "mps3.ini.erb")
-    if File.file?(template)
-      File.read(template)
-    else
-      puts "WARNING: Template file #{template} expected but not found"
-    end
-  end
 
-  def mps_binding()
-    mps=MPSTemplateBinding.new
-    mps.output="mps3.ini"
-    mps
-  end
-
-
-end
-
-
-
-class SetupConfiguration::SetupCodeBinding < SetupConfiguration::Generator::TemplateBinding
-
-  def initialize
-    super
-  end
-
-  def parameters
-    #TODO use set or something similar
-    suite.parameters.select(){|p| p.param? }
-  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|
-        memo >= param.key.to_s.length ? memo : param.key.to_s.length
-      end
-      @longest=longest + 5
-    end
-    @longest
-  end
-end
-
-class SetupConfiguration::SetupCodeGenerator
-  
-  def generate(suite, output_path)
-    setup_code=SetupConfiguration::SetupCodeBinding.new
-    setup_code.output="LOGCODE#{suite.name.to_s.upcase}SETUP.EXP"
-    setup_code.suite=suite
-
-    if template then
-      rhtml = Erubis::Eruby.new( template )
-
-      File.open(File.join(output_path, setup_code.output), "w") do |f|
-        f << rhtml.result(setup_code.get_binding)
-      end
-    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)
-      File.read(template)
-    else
-      puts "WARNING: Template file #{template} expected but not found"
-    end
-  end
-
-end
-
-
-class SetupConfiguration::SuiteGenerator
-  include SetupConfiguration::Generator
-
-  attr_accessor :suite
-  attr_accessor :do_not_run
-
-  def initialize
-    self.do_not_run = false
-    self.suite = SetupConfiguration::Suite.instance
-  end
-
-  def self.do_not_run
-    self.do_not_run=true
-  end
-
-  def generate
-    return "no output" if self.do_not_run
-
-    description_bindings().each() do |bind|
-      bind.suite=self.suite
-      rhtml = Erubis::Eruby.new(description_template)
-
-      File.open(File.join(output_path, bind.output), "w") do |f|
-        f << rhtml.result(bind.get_binding)
-      end
-    end
-
-    # extras:
-    # -every PARAMETER key needs a value!
-    # -use Windows line terminators CRLF - \r\n
-    # - do not use [] - output is an INI-file
-    parameter_bindings().each() do |bind|
+      bind=mps_binding()
       bind.suite=self.suite
-      template = parameter_template(bind.lang_name())
-      if template then
-        rhtml = Erubis::Eruby.new(template)
-
-        File.open(File.join(output_path, bind.output), "w") do |f|
-          f << rhtml.result(bind.get_binding)
-        end
-      else
-        puts "WARNING: No template found. Generation of #{bind.output} aborted."
-      end
-    end
-
-    bind=mps_binding()
-    bind.suite=self.suite
-    mps_template=mps_template()
-    if mps_template then
-      rhtml = Erubis::Eruby.new(mps_template)
+      mps_template=mps_template()
+      output(bind, mps_template)
 
-      File.open(File.join(output_path, bind.output), "w") do |f|
-        f << rhtml.result(bind.get_binding)
-      end
-    else
-      puts "WARNING: No template found. Generation of #{bind.output} aborted."
+      SetupCodeGenerator.new.generate(self.suite, output_path)
     end
 
-    SetupConfiguration::SetupCodeGenerator.new.generate(self.suite, output_path)
   end
-end
 
+end

data/lib/setup_configuration/template_binding.rb

@@ -0,0 +1,28 @@
+# encoding: windows-1252
+
+module SetupConfiguration
+
+  module Generator
+
+    class TemplateBinding
+
+      attr_accessor :suite
+      attr_accessor :output
+
+      def categories
+        #TODO maybe cache these values for better performance...?
+        suite.categories.keys().sort()
+      end
+
+      # Support templating of member data.
+      def get_binding
+        binding
+      end
+
+      def find_param_by_number(number)
+        self.suite.find_param_by_number(number)
+      end
+
+    end
+  end
+end

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

@@ -67,8 +67,8 @@ SYSTEM18=Please select a language.
 SYSTEM19=Ok
 SYSTEM20=Cancel
 SYSTEM21=Info
-SYSTEM22=Setup program V5.0.25
-SYSTEM23=Progdat: Apr.08.04 Inidat: Aug.20.05
+SYSTEM22=Setupprogramm V6.0.01
+SYSTEM23=Progdat: Apr.08.04 Inidat: Sep.07.05
 SYSTEM24=(c) Weber GmbH
 SYSTEM25=Ready
 SYSTEM26=Closed