zeno 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407fe6d469b4853fb6186c2ac76933f50da238fd
-  data.tar.gz: da94174e421b64a804a373ff9003b22587008d52
+  metadata.gz: baf2090e5f653f8ee3d69f7b223478cda64961db
+  data.tar.gz: 4e7dbf27b871829743bfcdf33ca762ee986cb736
 SHA512:
-  metadata.gz: 3ed8938ecc1d5fd96e06cebc1f1a265c45a16b7dcd9b5275c3431012d873df7300bebeee227398e2a2928fe3ada290ae6f2c65122228e3e291b42be64f08150b
-  data.tar.gz: 1594f335c87c41bd7a2bd4d59d767c830800b703c6e59d563114d8eed9a89a73f108371b6a9c03a8d5231b26bf998766520236535a73fd2e446aed12bb3458c1
+  metadata.gz: 3aa5224b3afd88c8a0c7f3299f489ceb8bf24005b2c8f16755f7ba384dc666a31dce0c1e01ce81df5dc63a640dae612b2090ae619c36718905f7c7d2f7f30a43
+  data.tar.gz: ebe2265c32c5a565bebab406376ec56848b78d4364793ba611fae8c6cbcc24a5a066c4999b0bbaba7fc03f23c69d5ad69ab123f442fdac77bcf983266c7ff4d2

data/lib/zeno.rb

@@ -29,6 +29,7 @@ require 'zeno/version'
 require 'zeno/application'
 require 'zeno/solution'
 require 'zeno/applicationalreadyexistserror'
+require 'zeno/missingargumentexception'
 
 # Zeno base module
 module Zeno
@@ -115,8 +116,9 @@ module Zeno
       options.path = Dir.pwd
       options.libdir = nil
       options.target = nil
-      options.version = nil
+      options.version = 'stable'
       options.apps = nil
+      options.uploader = nil
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: zeno solution [options]"
@@ -136,14 +138,14 @@ module Zeno
 
         # Mandatory
         opts.on("-l", "--libs PATH",
-                "Path to the ETA/OS libraries") do |path|
-          options.libdir = File.expand_path path
+                "Relative path to the ETA/OS libraries") do |path|
+          options.libdir = path
         end
 
-	opts.on("-a", "--apps APPS",
-		"List of applications to generate (comma separated") do |apps|
-	  options.apps = apps.split(',')
-	end
+      	opts.on("-a", "--apps APP1[,APP2,APPn]",
+      		"List of applications to generate (comma separated") do |apps|
+      	  options.apps = apps.split(',')
+      	end
 
         # Mandatory
         opts.on("-t", "--target TARGET",
@@ -156,6 +158,16 @@ module Zeno
           options.version = ref
         end
 
+        opts.on("-A", "--avrupload",
+                "Configure the application Makefiles to use avrupload") do |u|
+          options.uploader = :avrupload
+        end
+
+        opts.on("-d", "--avrdude",
+                "Configure the application Makefiles to use avrdude") do |a|
+          options.uploader = :avrdude
+        end
+
         opts.separator ""
         opts.separator "Common options:"
 
@@ -172,16 +184,16 @@ module Zeno
 
       parser.parse!
 
-      mandatory = [:name, :libdir, :target]
-      missing = mandatory.select do |param|
-        if options[param].nil? or options[param] == false
-          param
-        end
-      end
+      mandatory = {
+        :name => '-n',
+        :libdir => '-l',
+        :target => '-t'
+      }
 
-      unless missing.empty?
-        puts "Missing mandatory options!"
-        puts ""
+      begin
+        Zeno.check_missing_args!(options, mandatory)
+      rescue MissingArgumentException => e
+        puts "#{e.msg}: #{e.missing_arguments.values.join(', ')}"
         puts parser
         exit
       end
@@ -193,6 +205,7 @@ module Zeno
       opts['libs'] = options.libdir
       opts['path'] = options.path
       opts['target'] = options.target
+      opts['uploader'] = options.uploader
 
       solution = Zeno::Solution.new(opts)
       solution.create
@@ -207,6 +220,7 @@ module Zeno
       options.app = false
       options.libdir = nil
       options.target = nil
+      options.uploader = nil
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: zeno app [options]"
@@ -215,7 +229,7 @@ module Zeno
 
         # Mandatory
         opts.on("-r", "--root PATH",
-                "Absolute path to ETA/OS") do |path|
+                "Path to ETA/OS") do |path|
           options.epath = path
         end
 
@@ -227,7 +241,7 @@ module Zeno
 
         # Mandatory
         opts.on("-l", "--libs PATH",
-                "Path to the ETA/OS libraries") do |path|
+                "Relative path to the ETA/OS libraries") do |path|
           options.libdir = path
         end
 
@@ -237,6 +251,16 @@ module Zeno
           options.target = target
         end
 
+        opts.on("-A", "--avrupload",
+                "Configure the application Makefiles to use avrupload") do |u|
+          options.uploader = :avrupload
+        end
+
+        opts.on("-d", "--avrdude",
+                "Configure the application Makefiles to use avrdude") do |a|
+          options.uploader = :avrdude
+        end
+
         opts.separator ""
         opts.separator "Common options:"
 
@@ -255,22 +279,26 @@ module Zeno
       options.app = true
 
       mandatory = [:app, :epath, :name, :target, :libdir]
-      missing = mandatory.select do |param|
-        if options[param].nil? or options[param] == false
-          param
-        end
-      end
+      mandatory = {
+        :app => 'Critical failure',
+        :epath => '-r',
+        :name => '-n',
+        :target => '-t',
+        :libdir => '-l'
+      }
 
-      unless missing.empty?
-        puts "Missing mandatory arguments"
-        puts ""
+      begin
+        Zeno.check_missing_args!(options, mandatory)
+      rescue MissingArgumentException => e
+        puts "#{e.msg}: #{e.missing_arguments.values.join(', ')}"
         puts parser
         exit
       end
 
       begin
         scaffolder = Zeno::Application.new(options.name, options.epath,
-                                           options.libdir, options.target)
+                                           options.libdir, options.target,
+                                           options.uploader)
         scaffolder.create
         scaffolder.generate
       rescue ApplicationAlreadyExistsError => e
@@ -315,14 +343,11 @@ module Zeno
       ref = Zeno.parse_target(target)
       ref.strip!
       uri = URI("https://git.bietje.net/etaos/etaos/repository/archive.zip?ref=#{ref}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
 
-      request = Net::HTTP::Get.new(uri.request_uri)
-      response = http.request(request)
+      response = Net::HTTP.get(uri)
       zip = Tempfile.new("etaos-#{ref}.zip", Dir.tmpdir, 'wb+')
       zip.binmode
-      zip.write(response.body)
+      zip.write(response)
       path = zip.path
       zip.close
 
@@ -344,6 +369,20 @@ module Zeno
       f_path_new = File.join(out, "etaos-#{ref}")
       FileUtils.mv f_path, f_path_new
     end
-  end
-end
 
+    # Check if any arguments are missing.
+    # @param options [OpenStruct] Structure of the complete argument set.
+    # @param mandatory Hash of mandatory arguments
+    # @return nil
+    def check_missing_args!(options, mandatory = {})
+      return nil if mandatory.empty?
+
+      missing = mandatory.select do |param, value|
+        options[param].nil? or options[param] == false
+      end
+
+      raise Zeno::MissingArgumentException.new(missing) unless missing.empty?
+      nil
+    end
+  end # class
+end # module Zeno

data/lib/zeno/application.rb

@@ -20,13 +20,14 @@ require 'zeno/makefile'
 
 module Zeno
   class Application
-    attr_reader :dirname, :etaos_path, :arch, :libdir
+    attr_reader :dirname, :etaos_path, :arch, :libdir, :uploader
 
-    def initialize(name, path, libdir, arch)
+    def initialize(name, path, libdir, arch, upload = nil)
       @dirname = name
       @etaos_path = "../#{path}"
-      @libdir = libdir
+      @libdir = "#{libdir}/etaos"
       @arch = arch
+      @uploader = upload
     end
 
     def create
@@ -42,12 +43,37 @@ module Zeno
     private
 
     def generate_mkfile
-      target_rule = "@$(MAKE) -C $(ETAOS) A=#{Dir.pwd}/#{@dirname} ARCH=#{@arch} CROSS_COMPILE=#{@arch}-"
+      target_rule = "@$(MAKE) -C $(ETAOS) A=`pwd` ARCH=#{@arch} CROSS_COMPILE=#{@arch}-"
       file = "#{@dirname}/Makefile"
       mkfile = Zeno::Makefile.new file
       mkfile.add_var('ETAOS', @etaos_path)
+      mkfile.add_var('MAKEFLAGS', '-rR --no-print-directory', '+=')
+      mkfile.add_var('OBJCOPY', "#{@arch}-objcopy")
+      mkfile.add_var('MCU', "# TODO: add MCU")
+      mkfile.add_var('BAUD', "115200")
+      mkfile.add_var('PROGRAMMER', "# TODO: set programmer")
+      mkfile.add_var('PORT', "# TODO: set port")
+      mkfile.add_var('AVRDUDE', "avrdude")
+      mkfile.add_var('AVRUPLOAD', "avrupload")
       mkfile.add_target('all', target_rule + " app")
       mkfile.add_target('clean', target_rule + " clean")
+
+      hex_rule = "@$(OBJCOPY) -R .eeprom -O ihex #{@dirname}.img #{@dirname}.hex"
+      avrdude_rule = "@$(AVRDUDE) -D -q -V -p $(MCU) -c $(PROGRAMMER) -b $(BAUD) -P $(PORT) "
+      avrdude_rule << "-C /etc/avrdude.conf -U flash:w:#{@dirname}.hex:i"
+
+      avrupload_rule = "@$(AVRUPLOAD) -fH test-app.hex -m $(MCU) -p $(PROGRAMMER) -P $(PORT) "
+      avrupload_rule << "-b $(BAUD) -c /etc/avrdude.conf"
+
+      case @uploader
+      when :avrdude
+        mkfile.add_target('hex', hex_rule)
+        mkfile.add_target('upload', avrdude_rule)
+      when :avrupload
+        mkfile.add_target('hex', hex_rule)
+        mkfile.add_target('upload', avrupload_rule)
+      end
+
       mkfile.generate
     end
 

data/lib/zeno/makefile.rb

@@ -58,4 +58,3 @@ module Zeno
     end
   end
 end
-

data/lib/zeno/missingargumentexception.rb

@@ -0,0 +1,35 @@
+#
+#   MissingArgumentException class
+#   Copyright (C) 2017  Michel Megens <dev@bietje.net>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+module Zeno
+	class MissingArgumentException < StandardError
+		attr_reader :msg, :missing_arguments
+
+		@msg = nil
+		@missing_arguments = nil
+
+		def initialize(missing, msg = nil)
+			@msg = msg || "Mandatory arguments are missing!"
+			@missing_arguments = missing
+		end
+
+		def message
+			@msg
+		end
+	end # class MissingArgumentException
+end # module Zeno

data/lib/zeno/solution.rb

@@ -27,6 +27,7 @@ module Zeno
     @libs = nil
     @apps = nil
     @target = nil
+    @uploader = nil
 
     def initialize(opts)
       @name = opts['name']
@@ -36,25 +37,25 @@ module Zeno
       @path = "#{@basepath}/#{@name}"
       @apps = opts['apps']
       @target = opts['target']
+      @uploader = opts['uploader']
 
       raise Zeno::ApplicationAlreadyExistsError if File.directory? @path
     end
 
-    def create()
+    def create
       FileUtils.mkdir_p @path unless File.directory? @path
       Dir.chdir @path
 
       version = Zeno.parse_target(@ref)
       etaos_path = "etaos-#{version}"
-      Zeno.download(@path, @ref)
+      Zeno.download(Dir.pwd, @ref)
 
       # Create applications
       @apps.each do |app|
-	application = Zeno::Application.new(app, etaos_path, @libs, @target)
-	application.create
-	application.generate
+        application = Zeno::Application.new(app, etaos_path, @libs, @target, @uploader)
+        application.create
+        application.generate
       end
     end
   end
 end
-

data/lib/zeno/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Zeno
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeno
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michel Megens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,22 +56,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Zeno generates ETA/OS applications with a single command.
 email:
 - dev@bietje.net
@@ -86,6 +86,7 @@ files:
 - lib/zeno/applicationalreadyexistserror.rb
 - lib/zeno/filegenerator.rb
 - lib/zeno/makefile.rb
+- lib/zeno/missingargumentexception.rb
 - lib/zeno/solution.rb
 - lib/zeno/version.rb
 homepage: http://bietje.net/zeno