zeno 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3ffb471e7920c26ef333a7c35cb55e50a5ef07
-  data.tar.gz: 7702c7a067b4acaefcabae86da7a91a5f620709a
+  metadata.gz: 748f50dfbeeda0f7812b26e3b69e5c7f8ad50f9a
+  data.tar.gz: a81aaa37f68472b44229177bcebf41190066b388
 SHA512:
-  metadata.gz: 9100ee4a02d0fde7d51195dbf4aa4bc2d12b88fa2e70bc806ee39a581cb00d6e3402b35209bde37e008ba1a93552edc58871f87a65cdf39efb02dbacc14b961d
-  data.tar.gz: 52675e5957d46c692334254159eaa2d328a8feb6606355e3e64dcba78f160317e435e84e77ebde65f3e6dd39adc6492e5fe35de88f20c9b591f719cc6ac4674d
+  metadata.gz: e8996482f98ebfdaf8829c566339bb17323b806ffe52a85f8a5acfe04cd3780912adaba412d3dcd99a941d4b1e31539dac40b3926df7d85b232592014c5bc381
+  data.tar.gz: 0c7ee5dfa1564bc8fcd0c71a60e8b32ebf9a94f817b4e7d54db2fa25767315f211def9ff1492bbf79f97cda31b0aa95f0a07c5fca9fa1cedcb7068132920b96b

data/lib/zeno/{scaffolder.rb → application.rb}

@@ -1,6 +1,6 @@
 #
 #   Zeno module
-#   Copyright (C) 2016  Michel Megens <dev@bietje.net>
+#   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
@@ -16,19 +16,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'fileutils'
-
 require 'zeno/makefile'
-require 'zeno/filegenerator'
-require 'zeno/applicationalreadyexistserror'
 
 module Zeno
-  class Scaffolder
+  class Application
     attr_reader :dirname, :etaos_path, :arch, :libdir
 
     def initialize(name, path, libdir, arch)
       @dirname = name
-      @etaos_path = path
+      @etaos_path = "../#{path}"
       @libdir = libdir
       @arch = arch
     end
@@ -59,6 +55,7 @@ module Zeno
       file = "#{@dirname}/Kbuild"
       gen = Zeno::FileGenerator.new file
       gen.add_var('obj-y', '# TODO: add source files', '+=')
+      gen.add_var('pyusrlib-y', '# TODO: add python libs or delete this line', '+=')
       gen.add_var('crurom-y', '# TODO: add crurom directory or delete this line', ':=')
       gen.add_var('crurom-obj', '# TODO: add crurom object file or delete this line', ':=')
       gen.add_var('ETAOS_LIBS', '-lc', '+=')
@@ -69,4 +66,3 @@ module Zeno
     end
   end
 end
-

data/lib/zeno/filegenerator.rb

@@ -29,7 +29,7 @@ module Zeno
     end
 
     def add_var(name, value, assign = '=')
-      @vars[name] = value
+      @vars[name] = "#{assign} #{value}"
     end
 
     def del_var(name)
@@ -47,7 +47,7 @@ module Zeno
     def to_s
       output = ""
       @vars.each do |key, value|
-        output += "#{key}=#{value}\n"
+        output += "#{key} #{value}\n"
       end
 
       output

data/lib/zeno/solution.rb

@@ -0,0 +1,60 @@
+#
+#   Zeno module
+#   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 Solution
+    attr_reader :name, :path
+
+    @name = nil
+    @basepath = nil
+    @path = nil
+    @ref = nil
+    @libs = nil
+    @apps = nil
+    @target = nil
+
+    def initialize(opts)
+      @name = opts['name']
+      @basepath = opts['path']
+      @ref = opts['ref']
+      @libs = opts['libs']
+      @path = "#{@basepath}/#{@name}"
+      @apps = opts['apps']
+      @target = opts['target']
+
+      raise Zeno::ApplicationAlreadyExistsError if File.directory? @path
+    end
+
+    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)
+
+      # Create applications
+      @apps.each do |app|
+	application = Zeno::Application.new(app, etaos_path, @libs, @target)
+	application.create
+	application.generate
+      end
+    end
+  end
+end
+

data/lib/zeno/version.rb

@@ -1,3 +1,21 @@
+#
+#   Zeno module
+#   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
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/zeno.rb

@@ -1,6 +1,6 @@
 #
 #   Zeno module
-#   Copyright (C) 2016  Michel Megens <dev@bietje.net>
+#   Copyright (C) 2016, 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
@@ -26,7 +26,8 @@ require 'zip'
 require 'net/http'
 
 require 'zeno/version'
-require 'zeno/scaffolder'
+require 'zeno/application'
+require 'zeno/solution'
 require 'zeno/applicationalreadyexistserror'
 
 # Zeno base module
@@ -52,7 +53,7 @@ module Zeno
         puts "Usage: zeno <command> <args>"
         puts ""
         puts "Available commands are:"
-        puts "   app\t\tScaffolder to create new ETA/OS applications"
+        puts "   app\t\tApplication to create new ETA/OS applications"
         puts "   get\t\tETA/OS download service"
         puts "   solution\tCreate an ETA/OS solution"
       end
@@ -115,6 +116,7 @@ module Zeno
       options.libdir = nil
       options.target = nil
       options.version = nil
+      options.apps = nil
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: zeno solution [options]"
@@ -138,6 +140,11 @@ module Zeno
           options.libdir = path
         end
 
+	opts.on("-a", "--apps APPS",
+		"List of applications to generate (comma separated") do |apps|
+	  options.apps = apps.split(',')
+	end
+
         # Mandatory
         opts.on("-t", "--target TARGET",
                 "ETA/OS target architecture") do |arch|
@@ -179,20 +186,16 @@ module Zeno
         exit
       end
 
-      ref = Zeno.parse_target(options.version)
-      etaos_path = "../etaos-#{ref}"
-      Zeno.download(options.path, options.version)
+      opts = Hash.new
+      opts['apps'] = options.apps
+      opts['name'] = options.name
+      opts['ref']  = options.version
+      opts['libs'] = options.libdir
+      opts['path'] = options.path
+      opts['target'] = options.target
 
-      begin
-        Dir.chdir options.name
-        scaffolder = Zeno::Scaffolder.new(options.name, etaos_path,
-                                           options.libdir, options.target)
-        scaffolder.create
-        scaffolder.generate
-      rescue ApplicationAlreadyExistsError => e
-        puts "Error: #{e.message}"
-        exit
-      end
+      solution = Zeno::Solution.new(opts)
+      solution.create
     end
 
     # Start the app subcommand.
@@ -266,7 +269,7 @@ module Zeno
       end
 
       begin
-        scaffolder = Zeno::Scaffolder.new(options.name, options.epath,
+        scaffolder = Zeno::Application.new(options.name, options.epath,
                                            options.libdir, options.target)
         scaffolder.create
         scaffolder.generate
@@ -311,7 +314,7 @@ module Zeno
       silly_name = nil
       ref = Zeno.parse_target(target)
       ref.strip!
-      uri = URI("https://git.bietje.net/etaos/etaos/repository/archive.zip?ref=#{ref}")
+      uri = URI("https://git.bietje.net/etaos/etaos/archive/#{ref}.zip")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeno
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Michel Megens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,10 +82,11 @@ extra_rdoc_files: []
 files:
 - bin/zeno
 - lib/zeno.rb
+- lib/zeno/application.rb
 - lib/zeno/applicationalreadyexistserror.rb
 - lib/zeno/filegenerator.rb
 - lib/zeno/makefile.rb
-- lib/zeno/scaffolder.rb
+- lib/zeno/solution.rb
 - lib/zeno/version.rb
 homepage: http://bietje.net/zeno
 licenses:
@@ -107,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ETA/OS scaffolder
 test_files: []
-has_rdoc: