pi_build_modifier 0.1.1.pre.alpha → 0.1.2.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1caec8f16b318afe28de0761d2ec6095114cd20
-  data.tar.gz: 2115fd2138d16d95f30e648d4a11f778cf8ed48d
+  metadata.gz: 6fe3e70cdf359d53a82e7c18900c1d1f21cda2b6
+  data.tar.gz: 9505cbf31fe7f24d9b15209cf8e4210c6fe93b8e
 SHA512:
-  metadata.gz: 9af6f92c78bec16c33d337d9186a6d1277a1aa2a76489ffbe06f8eb6fe8fd6c5fc254ea09ff649e1dae10dc4b02ae88c8edb99921636597b3b47dae2d71618e9
-  data.tar.gz: 1fb2bf4dfa3fa21a2dac4974aa2057bc4142e428562b5fd52e2be422a9ec250fa0e1b91124e37f9068235366e273b791dfa130818a38fd9364d3326d5dc16840
+  metadata.gz: a30469649affb4beff2b06060639ed1ad39de6a6b57c875a0d5acaa667e079fc1cc0a414ba2229aa2f8f21841c3ef0e8b16a5eecfe31efc6221f467cb1fdbee9
+  data.tar.gz: acb8a7ea0a5ba3056a8ab0ce8addd0c6b22c291e62e75f83438ddf2efe4af1e7a5920a03ef498dcf7e02af4163fb82180ec8a19373f0c6cd59957cec888caca5

data/lib/pi_build_modifier/modifier_task.rb

@@ -37,8 +37,8 @@ module PiBuildModifier
 
         @pi_modifier.with_mapper(ERBMapper.new(WPASupplicant.new, workspace))
         @pi_modifier.with_mapper(System.new(workspace))
-        @pi_modifier.with_mapper(ERBMapper.new(Ssh.new, workspace))
-        @pi_modifier.with_mapper(RunModifier.new(workspace))
+        @pi_modifier.with_mapper(Ssh.new.mapper(workspace))
+        @pi_modifier.with_mapper(RunModifier.new.mapper(workspace))
       end
 
       def execute

data/lib/pi_build_modifier/net-tweaks/templates/wpa_supplicant.conf.erb

@@ -2,6 +2,4 @@ country=<%= @wpa_country %>
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1
 
-<% @networks.each do |network|  %>
-    network=<%= network %>
-<% end %>
+<% @networks.each do |network|  %>network=<%= network %><% end %>

data/lib/pi_build_modifier/sys_tweaks/run_modifier.rb

@@ -21,35 +21,39 @@
 require 'fileutils'
 require 'pi_build_modifier/modifier/mapper'
 
+
 module PiBuildModifier
 
+  ##
+  # RunModifier is a class which appends lines to the 'stage2/01-sys-tweaks/01-run.sh' file in the pi gen build repository
+
   class RunModifier < Mapper
 
-    attr_reader :relative_output_path
+    attr_reader :relative_output_path, :appender
 
-    @@append_lines = Array.new
-    def self.append_lines
-      @@append_lines
+    def initialize
+      @appender = Array.new
+      @workspace = nil
+      @relative_output_path = 'stage2/01-sys-tweaks/01-run.sh'
     end
 
-    def initialize(workspace)
+    def mapper(workspace)
       @workspace = workspace
-      @relative_output_path = 'stage2/01-sys-tweaks/01-run.sh'
+      self
     end
 
-    def self.append(append_line)
-      @@append_lines << append_line
+    def append(appender)
+      @appender << appender
     end
 
     def map(json_data)
     end
 
     def modify
-      puts @@append_lines.to_s
       open("#{@workspace}/#{@relative_output_path}", 'a') do |f|
         f.puts ''
-        @@append_lines.each do |a|
-          f.puts "source #{@workspace}/#{a}"
+        @appender.each do |a|
+          f.puts "source #{@workspace}/#{a.append_line}"
         end
       end
     end

data/lib/pi_build_modifier/sys_tweaks/ssh.rb

@@ -34,7 +34,14 @@ module PiBuildModifier
       @enable = 'enable'
       @template_path = File.join(File.dirname(__FILE__), '/templates/ssh.sh.erb').to_s
       @relative_output_path = 'stage2/01-sys-tweaks/ssh.sh'
-      RunModifier.append("#{@relative_output_path}")
+    end
+
+    def mapper(workspace)
+      ERBMapper.new(self, workspace)
+    end
+
+    def append_line
+      "#{@relative_output_path}"
     end
 
     def map(json_data)

data/lib/pi_build_modifier/system/system_type.rb

@@ -34,7 +34,7 @@ module PiBuildModifier
 
     def initialize(workspace)
       @workspace = workspace
-      @name = 'chiipi'
+      @name = 'custompi'
       @type = Type::FULL
       @relative_output_path = @workspace
     end

data/lib/pi_build_modifier/version.rb

@@ -19,5 +19,5 @@
 # SOFTWARE.
 
 module PiBuildModifier
-  VERSION = '0.1.1-alpha'
+  VERSION = '0.1.2-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pi_build_modifier
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre.alpha
+  version: 0.1.2.pre.alpha
 platform: ruby
 authors:
 - Beate Ottenwälder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler