machine_setup 0.4.1 → 0.5.0

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

@@ -21,6 +21,12 @@ SetupConfiguration :<%= @name.to_sym %>, :<%= @abbreviation.to_sym %> do
     <% if param.type? %>
       for_machine_type <%= compute_machine_types(param.machine_type) %>
     <% end %>
+    <% if param.options? %>
+      has_options <%= render_options(param.options) %>
+    <% end %>
+    <% if param.roles? %>
+      enabled_for_role <%= render_roles(param.roles) %>
+    <% end %>
     end
     <% else %>
     

data/lib/setup_configuration/mps_template_binding.rb

@@ -7,7 +7,8 @@ module SetupConfiguration
     class MPSTemplateBinding < TemplateBinding
 
       def initialize
-        yield self
+        yield self if block_given?
+        @max_number_parameters_per_tab=50
       end
 
       def languages
@@ -20,15 +21,18 @@ module SetupConfiguration
 
       def param_infos(category_key)
         parameters=suite.categories[category_key]
-        depends, machine_type, number=[], [], []
+        depends, machine_type, number, options, roles=[], [], [], [], []
         parameters.each() do |param|
           machine_type << param.machine_type
           number << param.number
           depends << depends_on(param.dependency)
+          options << param.options
+          roles << param.roles
         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) } }
+        bundle = [depends, machine_type, number, options, roles].collect() { |arr| arr.in_groups_of(@max_number_parameters_per_tab, false) }
+        bundle = sanitize(bundle)
+        bundle.collect(){ |v| v.collect(){ |arr| prepare(arr) } }
       end
 
       private
@@ -53,6 +57,53 @@ module SetupConfiguration
         end
       end
 
+      def sanitize(bundle)
+        count_params = bundle.first.flatten.length
+        if count_params <= @max_number_parameters_per_tab
+          bundle
+        else
+          depends, machine_type, number, options, roles = *bundle
+          # iterating with each_cons(2) would be much nicer, but how do I get the index for shifting...
+          length = number.length
+          number.each_with_index() do |param_num, index|
+            if index < length-1
+              next_number_dup = number[index+1].dup
+              # use next_number_dup for iteration as we are changing number[index+1]
+              # iterate second array until the parameter group ends
+              next_number_dup.each() do |second|
+                group = param_group?(param_num.last, second)
+                if group
+                  bundle.each() do |member|
+                    member[index] << member[index+1].shift
+                  end
+                else
+                  break
+                end
+              end
+            end
+          end
+
+          bundle
+        end
+      end
+
+      # Does these two parameters belong to the same "parameter group"?
+      # The definition of a parameter group (as needed for working around 'grouping bug' in new setup editor):
+      # Two parameters shall be grouped together if:
+      # - two 'physical' consecutive parameters have also consecutive parameter numbers
+      #   and
+      # - these two parameters have the same dependency
+      #   or
+      #   the second parameter depends on the first parameter
+      def param_group?(last, first)
+        p1 = find_param_by_number(last)
+        p2 = find_param_by_number(first)
+        # parameters have sequenced numbers
+        result = (p1.number - p2.number).abs.eql?(1)
+        # parameters have same dependency or second parameter depends on first parameter
+        result && ( p1.dependency.eql?(p2.dependency) || p2.dependency.eql?(p1.key))
+      end
+
     end
   end
 end

data/lib/setup_configuration/parameter_template_binding.rb

@@ -22,22 +22,23 @@ module SetupConfiguration
 
       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)
+        $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}")
+        param = find_param_by_number(number)
+        if param && p_name.eql?(param.key.to_s)
+          $stderr.puts("WARNING: missing translation for key #{@lang}.#{param.key.to_s}.#{Translation::Translator::NAME}")
         end
-        p_name.empty? ? "placeholder for mps3.exe" : p_name
+        p_name.empty? ? 'placeholder for mps3.exe' : p_name
       end
 
       def description(number)
         translate(number) do |name, desc|
           begin
-            $stderr.puts("WARNING: missing translation for key #@lang.#{find_param_by_number(number).key.to_s}.#{Translation::Translator::COMMENT}") if desc.empty?
+            $stderr.puts("WARNING: missing translation for key #{@lang}.#{find_param_by_number(number).key.to_s}.#{Translation::Translator::COMMENT}") if desc.empty?
           rescue
             raise RuntimeError.new("ERROR: reading translation failed '#{desc.inspect()}'")
           end
@@ -56,7 +57,7 @@ module SetupConfiguration
             translation
           end
         else
-          ""
+          ''
         end
       end
 

data/lib/setup_configuration/setup_code_generator.rb

@@ -16,7 +16,7 @@ module SetupConfiguration
     private
 
     def template
-      find_template("logcodesetup.exp.erb")
+      find_template('logcodesetup.exp.erb')
     end
 
   end

data/lib/setup_configuration/setup_config.rb

@@ -19,11 +19,13 @@ module SetupConfiguration
     attr_accessor :name
     attr_accessor :abbreviation
     attr_accessor :next_category_number
+    attr_reader   :maximum_numbers_per_category
 
     def initialize
       self.categories= Hash.new { |hash, key| hash[key] = [] }
       self.settings= Setting.new()
       self.next_category_number = 0
+      @maximum_numbers_per_category = 150
     end
 
     def category(category, &category_params)
@@ -46,7 +48,7 @@ module SetupConfiguration
     end
 
     def category_by_name(name)
-      cat = self.categories.keys.select(){|c| c.name.eql?(name)}.first
+      cat = self.categories.keys.detect(){|c| c.name.eql?(name)}
       unless cat
         cat = Category.new
         cat.number = self.next_category_number!
@@ -66,7 +68,7 @@ module SetupConfiguration
     end
 
     # Gets all known parameters.
-    def parameters()
+    def parameters
       # cache parameters so sorting is necessary only once - this saves a lot of time...
       @parameters ||= categories.values.flatten.sort
     end
@@ -84,7 +86,7 @@ module SetupConfiguration
     # If there is no such parameter the method returns nil.
     #
     def find_param_by_key(key)
-      self.parameters().select(){|p| p.key.eql?(key)}.first
+      self.parameters().detect(){|p| p.key.eql?(key)}
     end
 
     #
@@ -92,16 +94,16 @@ module SetupConfiguration
     # If there is no such parameter the method returns nil.
     #
     def find_param_by_number(number)
-      self.parameters().select(){|p| p.number.eql?(number)}.first
+      self.parameters().detect(){|p| p.number.eql?(number)}
     end
 
     #
     # Validates the uniqueness of parameter keys and numbers.
     #
-    def validate_params()
+    def validate_params
 
       categories.each() do |key, value|
-        throw RuntimeError.new("ERROR: category '#{key}' contains more than 150 parameters. Reduce parameter count.") if value.size >150
+        throw RuntimeError.new("ERROR: category '#{key}' contains more than #{maximum_numbers_per_category} parameters. Reduce parameter count.") if value.size >maximum_numbers_per_category
       end
 
       keys=[]
@@ -137,7 +139,7 @@ module SetupConfiguration
     end#validate_params
 
     def assign_param_ref(ref)
-        param = self.parameters().select(){|p| p.key.eql?(ref.key) && p.param?}.first
+        param = self.parameters().detect(){|p| p.key.eql?(ref.key) && p.param?}
 
         if param
           ref.assign(param)
@@ -205,7 +207,7 @@ module SetupConfiguration
     attr_accessor :name
     attr_accessor :parameter
 
-    def initialize()
+    def initialize
       @parameter = []
     end
 
@@ -246,13 +248,13 @@ module SetupConfiguration
     #
     def drive(drive, number, added_props=[], &parameter_def)
 
-      key = symbol(drive, "drive")
-      drive_selection = symbol(key, "selection")
+      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=[%w(distance revolution), %w(gear in), %w(gear out), 'length', 'motortype']
       properties += added_props if added_props
       properties.each_with_index do |prop, index|
         parameter = param(symbol(key, *prop), number + index + 1) { depends_on drive_selection }
@@ -268,6 +270,39 @@ module SetupConfiguration
     end
   end
 
+  class SoftwareOptions
+    include BinaryCodedValues
+
+    OPTIONS = {:do_not_copy => 1, :needs_licence => 2}
+
+    def values
+      OPTIONS
+    end
+
+    # TODO check for maximum and raise error
+    def compute_options(number)
+      value(number)
+    end
+
+  end
+
+  class Roles
+    include BinaryCodedValues
+
+    ROLES = {:foreman => 1, :service => 2, :application_engineer => 4, :test_bay => 8, :developer => 16}
+
+    def values
+      ROLES
+    end
+
+    # TODO check for maximum and raise error
+    def compute_roles(number)
+      value(number)
+    end
+
+
+  end
+
   class Parameter
     include Enumerable
     include ParameterMachineTypeBridge
@@ -276,14 +311,20 @@ module SetupConfiguration
     attr_accessor :number
     attr_reader :dependency
     attr_reader :machine_type
+    attr_reader :options
+    attr_reader :roles
 
     def initialize(name, number)
       # depends upon no other parameter
       @dependency=:none
       # valid on all machines
       @machine_type=0
+      @options=0
+      @roles=0
       @key= name
       @number=number
+      @role = Roles.new
+      @option = SoftwareOptions.new
     end
 
     def depends_on(dependency)
@@ -294,6 +335,22 @@ module SetupConfiguration
       @machine_type=machine_type
     end
 
+    def has_options(*opt)
+      # use @options as initial value: multiple calls to has_options are possible and result value is chained
+      # (and not reset if using '0' as explicit initial value)
+      @options = opt.uniq.inject(@options) do |sum, o|
+        sum + @option.number(o)
+      end
+    end
+
+    def enabled_for_role(*roles)
+      # use @roles as initial value: multiple calls to enabled_for_role are possible and result value is chained
+      # (and not reset if using '0' as explicit initial value)
+      @roles = roles.uniq.inject(@roles) do |sum, r|
+        sum + @role.number(r)
+      end
+    end
+
     def <=>(parameter)
       self.number <=> parameter.number
     end
@@ -334,6 +391,14 @@ module SetupConfiguration
       assigned? ? @param.dependency : :none
     end
 
+    def options
+      assigned? ? @param.options : 0
+    end
+
+    def roles
+      assigned? ? @param.roles : 0
+    end
+
     def <=>(parameter)
       self.number <=> parameter.number
     end

data/lib/setup_configuration/suite_generator.rb

@@ -18,7 +18,7 @@ module SetupConfiguration
     end
 
     def generate
-      return "no output" if self.do_not_run
+      return 'no output' if self.do_not_run
 
       description_bindings().each() do |bind|
         bind.suite=self.suite

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

@@ -26,13 +26,19 @@ BEGIN_TYP<%= machine_type.sequence_number_coded %>=<%= machine_type.range.first
 
 [PARAMANZEIGE]
 <%  categories.each_with_index do |category, index| %>
-    <% dependencies, machine_types, parameters = param_infos(category) %>
+    <% dependencies, machine_types, parameters, options, roles = param_infos(category) %>
+4CF<%= index%>a=<%= roles[0] %>
+3CF<%= index%>a=<%= options[0] %>
 2CF<%= index%>a=<%= dependencies[0] %>
 1CF<%= index%>a=<%= machine_types[0] %>
 TAB<%= index%>a=<%= parameters[0] %>
+4CF<%= index%>b=<%= roles[1] %>
+3CF<%= index%>b=<%= options[1] %>
 2CF<%= index%>b=<%= dependencies[1] %>
 1CF<%= index%>b=<%= machine_types[1] %>
 TAB<%= index%>b=<%= parameters[1] %>
+4CF<%= index%>c=<%= roles[2] %>
+3CF<%= index%>c=<%= options[2] %>
 2CF<%= index%>c=<%= dependencies[2] %>
 1CF<%= index%>c=<%= machine_types[2] %>
 TAB<%= index%>c=<%= parameters[2] %>

data/lib/setup_configuration/translation.rb

@@ -4,7 +4,7 @@ module SetupConfiguration
 
   module Translation
 
-    FILE_EXTENSION="setup.param".freeze
+    FILE_EXTENSION='setup.param'.freeze
 
     def self.translation_file(config_name, lang)
       "#{config_name}.#{FILE_EXTENSION}.#{lang}.yml"
@@ -15,26 +15,26 @@ module SetupConfiguration
     end
 
     # Returns all supported setup languages.
-    def self.languages()
-      language_defs().keys()
+    def self.languages
+      language_defs.keys
     end
 
     def self.language_name(lang)
-      language_defs()[lang]
+      language_defs[lang]
     end
 
     def self.language_abbreviation(lang_name)
-      language_defs.invert()[lang_name.downcase]
+      language_defs.invert[lang_name.downcase]
     end
 
-    def self.language_names()
+    def self.language_names
       language_defs.values.sort
     end
 
     private
     
-    def self.language_defs()
-      {:de => "deutsch", :en => "english"}
+    def self.language_defs
+      {:de => 'deutsch', :en => 'english'}
     end
 
     class Translator
@@ -44,6 +44,10 @@ module SetupConfiguration
       COMMENT = :comment.freeze
       EMPTY = ''
 
+      if I18n.respond_to?(:enforce_available_locales)
+        I18n.enforce_available_locales = true
+      end
+
       # Adds a file with translations.
       def self.i18n_load_path(path)
         I18n.load_path << path

data/test/setup_configuration/legacy/data/v1/mps3.ini

@@ -0,0 +1,35 @@
+[EINSTELLUNG]
+TABSTART=2
+DRUCK=0
+DATKONVERT=0
+
+[SPRACHE]
+AKTUELL=0
+SPRACHE0=DEUTSCH
+SPRACHE1=ENGLISH
+
+[MINMAXWERTE]
+BEGIN_MIN=0
+END_MIN=0
+BEGIN_MAX=0
+END_MAX=0
+BEGIN_WAAG_MIN=3000
+END_WAAG_MIN=3029
+BEGIN_WAAG_MAX=3030
+END_WAAG_MAX=3059
+
+[MASCHINENTYP]
+BEGIN_TYP0=1000
+BEGIN_TYP1=2000
+BEGIN_TYP2=3000
+
+[PARAMANZEIGE]
+2CF1a=-1,-1,-1,31
+1CF1a=0,0,0,0
+TAB1a=29,30,31,32
+2CF1b=
+1CF1b=
+TAB1b=
+2CF1c=
+1CF1c=
+TAB1c=