machine_setup 0.4.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmJkMGRmN2JlMzVhYjZlZDM1MjhjZDBhMjgxOWVkYmU5YWQzOGNkYQ==
+  data.tar.gz: !binary |-
+    MDBiYmNlNDVhZDBlOGFkOTBjOWJhYmEwMGJiYWRmMTlmMmMzMGZkYg==
+SHA512:
+  metadata.gz: !binary |-
+    Y2U1NzZhM2RiOWNiZDcyN2M4ZTUyZWQwNjFjOGEzM2ViMWFlMTE3NDc5YTQ3
+    Y2FmY2M4YjEwYmM0NDI5YjczZmJmNzA2YWMxZDcyNzM1MmUwOWE3ZmIwN2Yx
+    OWNlNDc5ZGIxNGE3NWUzOTZlZDViYzI1ZDk4NGFiOTVkODcxNDQ=
+  data.tar.gz: !binary |-
+    YmEyNThhNDAxODZjZjRhNWNhMDc5M2QxYTJhZDZmYmYzMWYxY2FmNjIzNDVk
+    NjNlNmNiMGQxNTI0MmJmMDU4ZDA5MjZiM2JlNTgwYWUyOWU1ODI4ODMwNjkw
+    ODZhODFkMDE5ZGZiNTZhOWYzMGNiZmM5OTlhODgyZWFkMjg1YTM=

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/robi-wan/machine_setup"
     gem.authors = ["robi-wan"]
     gem.add_runtime_dependency "i18n", "~> 0.6"
-    gem.add_runtime_dependency "inifile", "~> 1.1"
+    gem.add_runtime_dependency "inifile", "~> 2.0"
     gem.add_runtime_dependency "erubis", "~> 2.7"
     gem.add_development_dependency "shoulda"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/bin/setup_config_gen

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 begin
-  trace = ARGV.delete("--trace")
+  trace = ARGV.delete('--trace')
   param_def=ARGV[0]
 
-  raise RuntimeError.new("Missing argument: file with parameter definition") if param_def.nil?
+  raise RuntimeError.new('Missing argument: file with parameter definition') if param_def.nil?
   raise RuntimeError.new("Wrong argument: file '#{param_def}' with parameter definition not found") unless File.file?(param_def)
 
   $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
@@ -17,11 +17,11 @@ begin
   suite=SetupConfiguration::Suite.instance
 
 #set output path
-  generator = SetupConfiguration::SuiteGenerator.new()
+  generator = SetupConfiguration::SuiteGenerator.new
   generator.output_path=File.dirname(param_def)
 
 # load files with translations
-  SetupConfiguration::Translation.translation_files(suite.name).each() do |t|
+  SetupConfiguration::Translation.translation_files(suite.name).each do |t|
     trans_file=File.join(File.dirname(param_def), t)
     if File.file?(trans_file)
       SetupConfiguration::Translation::Translator.i18n_load_path(trans_file)
@@ -30,16 +30,16 @@ begin
     end
   end
 
-  generator.generate()
+  generator.generate
 
   puts("#{File.basename(__FILE__)} completed.")
 rescue Exception => ex
   $stderr.puts("#{File.basename(__FILE__)} aborted!")
   $stderr.puts(ex.message)
   if trace
-    $stderr.puts(ex.backtrace().join("\n"))
+    $stderr.puts(ex.backtrace.join("\n"))
   else
-    $stderr.puts "(See full trace by running with --trace)"
+    $stderr.puts '(See full trace by running with --trace)'
   end
 
   exit(1)

data/lib/setup_configuration.rb

@@ -24,6 +24,7 @@ require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/paramete
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/mps_template_binding')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/setup_code_generator')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/setup_code_binding')
+require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/binary_coded_values')
 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')

data/lib/setup_configuration/binary_coded_values.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+module SetupConfiguration
+
+  # The <code>BinaryCodedValues</code> mixin provides common methods for transforming meaningful values
+  # in binary coded values - and vice versa.
+  # The class must provide a method <code>values</code>, which
+  # delivers a hash with the values and its numbers.
+  module BinaryCodedValues
+
+    # Gets the number (or: numerical value) of the given value.
+    def number(value)
+      if values.has_key?(value)
+        values[value]
+      else
+        raise ArgumentError.new("'#{value}' is not a valid option. Valid values: #{self.pretty}")
+      end
+    end
+
+    # Gets the value to the given number.
+    def value(number)
+      # 60.to_s(2).chars.to_a.reverse.each_with_index { |s,i| puts s; puts i}
+      result=[]
+      unless number.eql?(0) then
+        number.to_s(2).chars.to_a.reverse.each_with_index do |value, index|
+          if value.eql?('1')
+            # invert hash with values to get meaningful value (key) for given binary coded value
+            r = values.invert[2**index]
+            result << r if r
+          end
+        end
+      end
+      result
+    end
+
+    def pretty
+      s = ''
+      PP.pp(values.keys, s)
+      s
+    end
+  end
+
+end

data/lib/setup_configuration/encoding.rb

@@ -11,7 +11,7 @@ module SetupConfiguration
     end
 
     def self.default_encoding
-      "windows-1252"
+      'windows-1252'
     end
 
     def self.encoding

data/lib/setup_configuration/generator_module.rb

@@ -1,7 +1,7 @@
 module SetupConfiguration
 
   module Generator
-    @output_path=""
+    @output_path=''
 
     def output_path
       @output_path
@@ -15,7 +15,7 @@ module SetupConfiguration
       if template
         rhtml = Erubis::Eruby.new(template)
 
-        File.open(File.join(output_path, bind.output), "w") do |f|
+        File.open(File.join(output_path, bind.output), 'w') do |f|
           f << rhtml.result(bind.get_binding)
         end
       else
@@ -29,7 +29,7 @@ module SetupConfiguration
     #          [:en, "english", (0..199), "english1.lng"],
     #          [:en, "english", (200..599), "english2.lng"],
     #          [:en, "english", (600..1299), "english3.lng"],
-    def description_bindings()
+    def description_bindings
       Translation.languages().collect() do |lang|
         SetupConfiguration.description_ranges().collect() do |range|
           # constructs the output file names
@@ -48,7 +48,7 @@ module SetupConfiguration
     }.gsub(/^\s*/, '')
     end
 
-    def parameter_bindings()
+    def parameter_bindings
       Translation.languages().collect() do |lang|
         # constructs the output file names
         out= "#{Translation.language_name(lang)}.lng"
@@ -60,18 +60,18 @@ module SetupConfiguration
       find_template("#{lang.to_s}.lng.erb")
     end
 
-    def mps_template()
-      find_template("mps3.ini.erb")
+    def mps_template
+      find_template('mps3.ini.erb')
     end
 
-    def mps_binding()
+    def mps_binding
       MPSTemplateBinding.new do |mps|
-        mps.output="mps3.ini"
+        mps.output='mps3.ini'
       end
     end
 
     def find_template(name)
-      template=File.join(File.dirname(__FILE__), "templates", name)
+      template=File.join(File.dirname(__FILE__), 'templates', name)
       if File.file?(template)
         File.read(template)
       else

data/lib/setup_configuration/legacy/importer.rb

@@ -5,8 +5,6 @@ module SetupConfiguration
 
     class Importer
 
-      INI_LINE_SPLIT_PATTERN=','
-
       attr_reader :categories
 
       def initialize(folder, name, abbreviation)
@@ -30,27 +28,42 @@ module SetupConfiguration
       def output_language(output_path, lang)
         context = LanguageContext.new(@name, lang, self)
 
-        template=File.join(File.dirname(__FILE__), "templates", "setup.param.language.yml.erb")
+        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|
+        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")
+        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.#{Translation::FILE_EXTENSION}" ), "w") do |f|
+        File.open(File.join(output_path, "#{@name}.#{Translation::FILE_EXTENSION}" ), 'w') do |f|
           f << eruby.result(binding())
         end
 
       end
 
+
+      def render_options(binary)
+        options = SetupConfiguration::SoftwareOptions.new.compute_options(binary)
+        render_symbols(options)
+      end
+
+      def render_roles(binary)
+        roles = SetupConfiguration::Roles.new.compute_roles(binary)
+        render_symbols(roles)
+      end
+
+      def render_symbols(symbols)
+        symbols.collect(){|s| ":#{s}"}.join(', ')
+      end
+
       def compute_machine_types(binary)
         # 60.to_s(2).chars.to_a.reverse.each_with_index { |s,i| puts s; puts i}
         result=[]
@@ -58,19 +71,19 @@ module SetupConfiguration
           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")
+            if value.eql?('1')
               result << machine_type_by_number(index+1).name
             end
           end
         end
-        result.join(" + ")
+        result.join(' + ')
       end
 
       def machine_type_by_number(number)
-        @settings.machine_types.select() {|mt| mt.sequence_number.eql?(number)}.first
+        @settings.machine_types.detect() {|mt| mt.sequence_number.eql?(number)}
       end
 
-      def init_settings()
+      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')))
@@ -115,39 +128,9 @@ module SetupConfiguration
 
 
       #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)
-                  $stderr.puts("WARNING: parameter '#{ param_key(param_number)}' with number '#{param_number}' multiple defined. Duplicate found in category '#{category_name(cat_number)}'.")
-                  parameter = ParameterReference.new( param_key(param_number) )
-                  cat.parameter << parameter
-                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
+      def init_params
+        extractor = ParameterExtractor.new(@mps3['PARAMANZEIGE'], self)
+        extractor.extract()
 
         # replace parameter numbers with parameter keys
         parameters.each() do |param|
@@ -157,7 +140,7 @@ module SetupConfiguration
           end
         end
 
-        #get categorie names
+        #get category names
         self.categories.each do |cat|
           cat.name = category_name(cat.number)
         end
@@ -218,14 +201,14 @@ module SetupConfiguration
           file_number= index + 1 if range.include?(param_number.to_i)
         end
 
-        filename = lang.downcase << file_number.to_s << ".lng"
+        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")
+        description unless description.eql?('not used')
       end
 
       def parameters
@@ -233,11 +216,11 @@ module SetupConfiguration
       end
 
       def param_by_number(number)
-        self.parameters().select(){|p| p.number.eql?(number)}.first
+        self.parameters().detect(){|p| p.number.eql?(number)}
       end
 
       def category_by_number(number)
-        cat = self.categories.select(){|c| c.number.eql?(number)}.first
+        cat = self.categories.detect(){|c| c.number.eql?(number)}
         unless cat
           cat = Category.new
           cat.number = number
@@ -246,15 +229,7 @@ module SetupConfiguration
         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
 

data/lib/setup_configuration/legacy/legacy.rb

@@ -2,5 +2,6 @@
 require 'inifile'
 
 require File.expand_path(File.dirname(__FILE__) + '/parameter')
+require File.expand_path(File.dirname(__FILE__) + '/parameter_extractor')
 require File.expand_path(File.dirname(__FILE__) + '/language_context')
 require File.expand_path(File.dirname(__FILE__) + '/importer')

data/lib/setup_configuration/legacy/parameter.rb

@@ -3,12 +3,9 @@ module SetupConfiguration
   module Legacy
 
     class Parameter < SetupConfiguration::Parameter
-      def initialize(number)
-        @number=number
-      end
 
       def extended?
-        dep? || type?
+        dep? || type? || roles? || options?
       end
 
       def dep?
@@ -19,6 +16,22 @@ module SetupConfiguration
         @machine_type != 0
       end
 
+      def roles?
+        @roles != 0
+      end
+
+      def roles=(r)
+        @roles = r
+      end
+
+      def options?
+        @options != 0
+      end
+
+      def options=(o)
+        @options = o
+      end
+
       def param?
         true
       end

data/lib/setup_configuration/legacy/parameter_extractor.rb

@@ -0,0 +1,83 @@
+# encoding: utf-8
+module SetupConfiguration
+
+  module Legacy
+
+    class ParameterExtractor
+
+      INI_LINE_SPLIT_PATTERN=','
+
+      def initialize(p, importer=nil)
+        @params = p
+        @importer = importer
+      end
+
+      def extract
+        @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("#{cat_level}")
+              types = machine_types("#{cat_level}")
+              options = param_options("#{cat_level}") # may be nil
+              roles = roles("#{cat_level}") # may be nil
+
+              cat = @importer.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 @importer.param_by_number(param_number)
+                  $stderr.puts("WARNING: parameter '#{ @importer.param_key(param_number)}' with number '#{param_number}' multiple defined. Duplicate found in category '#{@importer.category_name(cat_number)}'.")
+                  parameter = ParameterReference.new(@importer.param_key(param_number))
+                  cat.parameter << parameter
+                else
+                  key = @importer.param_key(param_number)
+                  parameter = Parameter.new(key, param_number)
+                  parameter.depends_on(deps[index])
+                  parameter.for_machine_type(types[index].to_i)
+                  parameter.options = options[index].to_i if options
+                  parameter.roles = roles[index].to_i if roles
+                  cat.parameter << parameter
+                end
+              end
+
+            end
+          end
+        end
+
+      end
+
+      # key = 2CF#{level}
+      def param_dependencies(level)
+        split(@params["2CF#{level}"])
+      end
+
+      # key = 1CF#{level}
+      def machine_types(level)
+        split(@params["1CF#{level}"])
+      end
+
+      # key = 3CF#{level}
+      # may return nil
+      def param_options(level)
+        split(@params["3CF#{level}"])
+      end
+
+      # key = 4CF#{level}
+      # may return nil
+      def roles(level)
+        split(@params["4CF#{level}"])
+      end
+
+      def split(pars)
+        pars.split(INI_LINE_SPLIT_PATTERN) if pars
+      end
+
+    end
+
+  end
+end