rakish 0.9.11.beta → 0.9.13.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76add697656e40d4a07ed495c25dc8e89015582873066c66b86904e18c8c46b
-  data.tar.gz: 1f3077d8a0246a0ed4ac0bac085443fa05ccb0b93b1cab753ea58fdf16674995
+  metadata.gz: ae019f56cf84c70afd026b3b5249827ee98a1e593ab066d55022baf966a1484b
+  data.tar.gz: 4204cca818ec52739b306e9bf768498ab30dc7e1a10155c7e74c44f73f12860e
 SHA512:
-  metadata.gz: fc547a117eaa7e5935ce84498c9bd5bddc73b55002cbba772995386c58f46cfd2d6a81f815396fbdd72d5f7b689edb52c88a0d50ed0f52e42d8c542acc34dbc9
-  data.tar.gz: 77b12ea0587eac95bc51c7562d6b1fa82a20ab4c00be7023b0140608c99360f459ee4347fdd46e7491d13d1965e1ffc3df7cade5072dd3afc240bc786def4850
+  metadata.gz: 0f6b26bb217757116ff363bac7592efdc03a2a769c23aadce1c53cf47002094724b7d50477e188831187e02c088758508997f8862fee1f16bc9c735bfed791a4
+  data.tar.gz: e66504f2541f351117762c624c4aeeefd44114fc76b392b682fd497cc81f6703b091254dcfca6623acb9c208152184ea2023056d183828117fb58f3e04337e41

data/bin/artd-rakish-bin/call-rake.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="call-rake" default="" xmlns:if="ant:if" >
+
+	<dirname property="my.directory" file="/bin/artd-rakish-bin/call-rake.xml"/>
+	<dirname property="jsdk.home" file="${java.home}"/>
+
+	<condition property="os.windows">
+		<os family="windows"/>
+	</condition>
+	<condition property="os.linux">
+		<os family="unix" name="linux" />
+	</condition>
+
+    <property environment="env"/>
+
+    <macrodef name="createOsMacros">
+        <sequential if:set="os.windows">
+
+            <exec executable="artd-rakish-find" outputproperty="rake.exec.path">
+                <arg value="exec-rake.bat"/>
+            </exec>
+
+            <macrodef name="call-rake">
+                <attribute name="file" default="./rakefile.rb"/>
+                <attribute name="target" default="_not_set_" />
+                <attribute name="log" default="rake.log"/>
+                <attribute name="trace" default=""/>
+                <attribute name="rake.path" default="${rake.exec.path}"/>
+                <attribute name="java.home" default="${jsdk.home}"/>
+                <attribute name="idea.project" default="${user.dir}/.idea"/>
+                <sequential>
+                    <property name="_rake_target_" value="@{target}" />
+                    <script language="javascript">
+                        if(project.getProperty("_rake_target_") == "_not_set_") {
+                        project.setProperty("_rake_target_", self.getOwningTarget());
+                        }
+                    </script>
+                    <record name="@{log}" action="start"/>
+                    <exec executable="cmd">
+                        <arg value="/c"/>
+                        <arg value="@{rake.path}"/>
+                        <arg value="-f"/>
+                        <arg value="@{file}"/>
+                        <arg value="@{trace}"/>
+                        <arg value="${_rake_target_}"/>
+                        <arg value="&quot;'JAVA_HOME=@{java.home}'&quot;"/>
+                        <arg value="&quot;'IDEA_PROJECT=@{idea.project}'&quot;"/>
+                    </exec>
+                    <record name="@{log}" action="stop"/>
+                </sequential>
+            </macrodef>
+        </sequential>
+        <sequential if:set="os.linux">
+            <!-- in this case rake needs to be in the system path -->
+            <property name="rake.exec.path"
+                      value="rake" />
+            <macrodef name="call-rake">
+                <attribute name="file" default="./rakefile.rb"/>
+                <attribute name="target" default="_not_set_" />
+                <attribute name="log" default="rake.log"/>
+                <attribute name="trace" default=""/>
+                <attribute name="rake.path" default="${rake.exec.path}"/>
+                <attribute name="java.home" default="${jsdk.home}"/>
+                <attribute name="idea.project" default="${user.dir}/.idea"/>
+                <sequential>
+                    <property name="_rake_target_" value="@{target}" />
+                    <script language="javascript">
+                        if(project.getProperty("_rake_target_") == "_not_set_") {
+                        project.setProperty("_rake_target_", self.getOwningTarget());
+                        }
+                    </script>
+                    <record name="@{log}" action="start"/>
+                    <exec executable="@{rake.path}">
+                        <arg value="-f"/>
+                        <arg value="@{file}"/>
+                        <arg value="@{trace}"/>
+                        <arg value="${_rake_target_}"/>
+                        <arg value="JAVA_HOME=@{java.home}"/>
+                        <arg value="IDEA_PROJECT=@{idea.project}"/>
+                    </exec>
+                    <record name="@{log}" action="stop"/>
+                </sequential>
+            </macrodef>
+        </sequential>
+	</macrodef>
+
+	<createOsMacros />
+
+	<!--
+    <target name="showprops">
+        <echoproperties/>
+    </target>
+    -->
+
+</project>

data/bin/artd-rakish-find

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+args = ARGV;
+
+if(args[0])
+    path = "#{File.expand_path(File.dirname(__FILE__))}/artd-rakish-bin/#{args[0]}";
+    if(File.exists?(path))
+        puts path;
+        exit 0
+    end
+    if(ENV['ARTD_TOOLS'])  # only will be found on windows when executed with artd-shell
+        path = File.expand_path("#{ENV['ARTD_TOOLS']}exec-rake.bat");
+        if(File.exists?(path))
+            puts path;
+            exit 0
+        end
+    end
+end
+

data/doc/ChangeLog.txt

@@ -48,3 +48,16 @@
     task :withCreateArgs,  [ :commandLineArg, ... ], :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
     task :withCreateArgs,  [ :commandLineArg, ... ]=>[ :deps ], :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
 
+0.9.12.beta
+
+-   Added binary script to return path to auxilliary support files used in ant scripts and other places that are
+    contained in this gem.
+
+-   Added call-rake.xml ant script for use in spawning calls to rake from intellij managed, and general,
+    ant scripts.
+
+0.9.13.beta
+
+- added second "args" arcument to all action lambdas for strict argument count checking
+  in ruby 2.0+
+  

data/doc/SimpleJavaSamples.txt

@@ -55,14 +55,21 @@ The JavaProjectModule does export some standard targets :compile, :javadoc, :dis
             cfg.resourceDir = "#{cfg.buildDir}/production/.orlando";
 
             # Java configuration items.
+            java = cfg.java;
 
             cfg.java_home = ENV['JAVA_HOME'];
             cfg.ant_home = ENV['ANT_HOME'] || '/usr/share/ant';
+
             # cfg.catalina_home = ENV['CATALINA_HOME'] || '/usr/share/tomcat7';
-            java = cfg.java;
             java.addJarSearchPath("#{myDir}/third-party-jars");
             java.addClassPaths( 'log4j-1.2.17.jar' ); # everything will inherit this
 
+            if(cfg.intellij) # we are running this from an intellij UI
+                java.addJavacFlags(cfg.intellij.javacFlags);
+            else
+                java.addJavacFlags("-Xlint:unchecked -encoding ISO-8859-1");
+            end
+
             # tomcat deployment options
 
             tomcatConfig = BuildConfig.new

data/doc/ToDoItems.txt

@@ -5,7 +5,7 @@
 
 ===Make a usable MultiProcessTask for spawning multiple asynchronous tasks
 The one in Rake actually slows things down when too
-many are spawned due to the thread swithing overhead so it really isn't practical.  What it should do is maintain a semaphone
+many are spawned due to the thread switching overhead so it really isn't practical.  What it should do is maintain a semaphone
 managed queue and only spawn as many tasks as there are processor cores on the machine to handle the big processes they
 spawn ( compilers and the like ) the little ruby tasks are better off being run in the primary thread unless they are
 doing something with a lot of waiting involved like uploading a file. In any case limiting the number of threads
@@ -13,6 +13,6 @@ would help this too.
 
 ===Make tomcat servlet module releasable
 ===A real manual
-===Make intellij integration module releasable
+===Make intellij integration module releasable (partly done)
 
 

data/doc/UserGuide

@@ -1,15 +1,15 @@
 
 = Rakish - Build system user guide
 
-
 :include:doc/RakishOverview.html
 
 ===See why I did it at the end if curious.
 
 :include:doc/SimpleJavaSamples.txt
 
+:include:doc/Utilties.txt
+
 :include:doc/WhyIDidIt.txt
 
 :include:doc/ToDoItems.txt
 
-

data/doc/Utilties.txt

@@ -0,0 +1,34 @@
+
+==Binary Utilities and Support files.
+
+===artd-rakish-find
+
+This is a utilty to find a non-ruby support file packaged with this gem.  It was needed
+to handle finding files when managed by the rvm package manger and other systems.
+
+It will return the full path via stdout to the location of the support files if found in the gem.
+
+On windows in my installation it will return via stdout only if piped so it doesn't spawn a
+command shell window - an annoyance with windows !!
+
+ie:
+
+    $ artd-rakish-find call-rake.xml > foo
+    $ type foo
+    D:/artd/third-party/tools/Ruby193/lib/ruby/gems/1.9.1/gems/rakish-0.9.12.beta/bin/artd-rakish-bin/call-rake.xml
+
+===call-rake.xml
+
+This is an ant script the XML file used as follows on linux or windows to facilitate calling rake tasks from ant scripts:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <project name="rake-targets" default="">
+        <exec executable="artd-rakish-find" outputproperty="rake.ant.xml">
+            <arg value="call-rake.xml"/>
+        </exec>
+        <import file="${rake.ant.xml}" />
+
+        <target name="subdirTest" description="test required subprojects">
+            <call-rake file="./test/subdir-test/rakefile.rb" target="subdir-test:test"/>
+        </target>
+    </project>

data/lib/rakish/CppProjects.rb

@@ -116,7 +116,7 @@ module CTools
 		[]
 	end
 
-	@@doNothingAction_ = lambda do |t|
+	@@doNothingAction_ = lambda do |t,args|
 		log.debug("attempting to compile #{t.source} into\n    #{t}\n    in #{File.expand_path('.')}");
 	end
 
@@ -381,21 +381,21 @@ module CppProjectModule
         @cflags||[];
     end
 
-	VCProjBuildAction_ = lambda do |t|
+	VCProjBuildAction_ = lambda do |t,args|
         require "#{Rakish::MAKEDIR}/VcprojBuilder.rb"
         VcprojBuilder.onVcprojTask(t.config);
 	end
 
-	VCProjCleanAction_ = lambda do |t|
+	VCProjCleanAction_ = lambda do |t,args|
         require "#{Rakish::MAKEDIR}/VcprojBuilder.rb"
         VcprojBuilder.onVcprojCleanTask(t.config);
 	end
 
-	LinkIncludeAction_ = lambda do |t|
+	LinkIncludeAction_ = lambda do |t,args|
 		config = t.config;
-	    if(config.verbose?)
+		if(config.verbose?)
 			puts "generating #{t.name} from #{t.source}"
-        end
+		end
 
 		destfile = t.name;
 		srcpath = config.getRelativePath(t.source,File.dirname(t.name));
@@ -445,8 +445,8 @@ module CppProjectModule
 		end
 	end
 
-	UpdateDependsAction_ = lambda do |t|
-        	doUpdateDepends(t) if(t.config.dependencyFilesUpdated)
+	UpdateDependsAction_ = lambda do |t,args|
+		doUpdateDepends(t) if(t.config.dependencyFilesUpdated)
 	end
 
 	def resolveConfiguredTasks()

data/lib/rakish/RaspberiPiCppTools.rb

@@ -248,7 +248,7 @@ module Rakish
                                                 :depends]
             end
 
-            @@resolveLinkAction_ = lambda do |t|
+            @@resolveLinkAction_ = lambda do |t,args|
             end
 
             # for consumers of CTools toolchain

data/lib/rakish/WindowsCppTools.rb

@@ -490,12 +490,12 @@ module Rakish
 			cfl					
 		end
 
-		@@compileCPPAction = lambda do |t|
+		@@compileCPPAction = lambda do |t,args|
 			t.config.ctools.doCompileCpp(t)
 		end
 		@@compileCAction = @@compileCPPAction;
 
-		@@compileRCAction = lambda do |t|
+		@@compileRCAction = lambda do |t,args|
 			t.config.ctools.doCompileRc(t)
 		end
 
@@ -556,7 +556,7 @@ module Rakish
 		end	
 
 
-		@@buildLibAction = lambda do |t|
+		@@buildLibAction = lambda do |t,args|
 			t.config.ctools.doBuildLib(t)
 		end
 		def doBuildLib(t)
@@ -595,7 +595,7 @@ module Rakish
 			system( cmdline );
 		end
 
-		@@linkDllAction = lambda do |t|
+		@@linkDllAction = lambda do |t,args|
 			t.config.ctools.doLinkDll(t)
 		end
 		def doLinkDll(t)
@@ -682,7 +682,7 @@ module Rakish
 			#endif
 		end
 
-		@@linkAppAction = lambda do |t|
+		@@linkAppAction = lambda do |t,args|
 			t.config.ctools.doLinkApp(t)
 		end
 		def doLinkApp(t)
@@ -751,7 +751,7 @@ module Rakish
 
 		end
 
-		@@makeManifestAction = lambda do |t|
+		@@makeManifestAction = lambda do |t,args|
 			t.config.tools.doMakeManifest(t)
 		end
 		def doMakeManifest(t)
@@ -835,7 +835,7 @@ module Rakish
 			return(resobjs)
 		end
 
-		@@resolveLinkAction_ = lambda do |t|
+		@@resolveLinkAction_ = lambda do |t,args|
 		end
 
 		def createLinkTask(objs,cfg)

data/lib/rakish/ZipBuilder.rb

@@ -20,7 +20,7 @@ module ZipBuilderModule
 
     public
 
-   	    def doBuildZipAction(t) # :nodoc:
+   	    def doBuildZipAction(t,args) # :nodoc:
 
             cfg = t.config;
 
@@ -60,7 +60,7 @@ module ZipBuilderModule
             end
         end
 
-        @@buildZipAction_ = ->(t) do
+        @@buildZipAction_ = ->(t,args) do
             t.config.doBuildZipAction(t);
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakish
 version: !ruby/object:Gem::Version
-  version: 0.9.11.beta
+  version: 0.9.13.beta
 platform: ruby
 authors:
 - Peter Kennard
@@ -34,21 +34,25 @@ cert_chain:
   d3bD+MvWz68LOvi+J4Tch0DV8mHIuHmUCL7o3RLXWgDWZ93RGm7cr6x+lVTMSOKQ
   SSBRP6HLDETO7acinRGftA==
   -----END CERTIFICATE-----
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies: []
 description: Rakish Rake build system built on top of Rake for managing large scale
   projects with lots of modules.
 email: peterk@livingwork.com
-executables: []
+executables:
+- artd-rakish-find
 extensions: []
 extra_rdoc_files:
 - doc/UserGuide
 files:
+- bin/artd-rakish-bin/call-rake.xml
+- bin/artd-rakish-find
 - doc/ChangeLog.txt
 - doc/RakishOverview.html
 - doc/SimpleJavaSamples.txt
 - doc/ToDoItems.txt
 - doc/UserGuide
+- doc/Utilties.txt
 - doc/WhyIDidIt.txt
 - lib/rakish.rb
 - lib/rakish/ArchiveBuilder.rb