arcadia 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4611baf00758fb21466c6dfd94cd49d42074dad1
-  data.tar.gz: f325bd7340e97c3a6ea3138f88294b30073da697
+  metadata.gz: 3a8388bee46d269b1298f228ec9f2d0bd879dab3
+  data.tar.gz: 4e23af4c7a2e7d5c680eda9cdda8bc5538779d04
 SHA512:
-  metadata.gz: f5288b57c81c601457884c1439f22baa190ac1ff4a89664acd5ae4772e398c5c58eedbf69d7973e4c3d03ac69830a0359b87416fd55d2102563c2acb7e7a45ec
-  data.tar.gz: 118c4e1c57fd930901eaf3188165b51e91284aab52cc60a907c89ffc28b094bffbde84a25bd3785be0386e77e10ec4930525a90f6f2961096e09692ba9c0a44a
+  metadata.gz: d5b666fd9c166cfec1eb62b50de3dc1ef9d239d94cec535eaa4a155f6cf03e8bd660ddb32147eeaec9e24e87239556be437e6d5358ac948ee80d17911291196d
+  data.tar.gz: 80768548ccd0189066e1fe2ca61a9ccb22d7e30dc23d4a24a13fc03dc45e8da2a1dc347fefa93c86635a309bf528e73aa468b444ce8059201fed73967b288db3

data/README.md

@@ -1,8 +1,8 @@
 # Arcadia IDE
-version 1.1.0
+version 1.1.1
 
 by Antonio Galeone
-on Sep 06, 2015
+on Sep 29, 2015
 
 ## About
 
@@ -26,6 +26,9 @@ Some of Arcadia IDE project features include:
 [https://github.com/angal/arcadia/wiki]
 
 ## News
+[1.1.1] This release:
+  - bug fixed [issue https://github.com/angal/arcadia/issues/58]
+
 [1.1.0] This release:
   - added possibility to define custom runner:
     go to "run current" menubutton and click on "Manage runner ...". A dialog window will open.

data/conf/arcadia.conf

@@ -671,10 +671,10 @@ theme=dark
 
 # runners keywords related the current file => FILE, DIR, FILE_BASENAME, FILE_BASENAME_WITHOUT_EXT
 runners_instance_history=3
-runners.ruby_file = {:lang=>"ruby",:cmd=>"<<RUBY>> -C'<<DIR>>' '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['ruby']),:file_exts=>".rb,.rbw"}
-WINDOWS::runners.ruby_file = {:lang=>"ruby", :cmd=>"rubyw -C'<<DIR>>' '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['ruby']),:file_exts=>".rb,.rbw"}
+runners.ruby_file = {:lang=>"ruby",:cmd=>"<<RUBY>> -C'<<DIR>>' '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['ruby']),:file_exts=>".rb,.rbw", :default=>"yes"}
+WINDOWS::runners.ruby_file = {:lang=>"ruby", :cmd=>"rubyw -C'<<DIR>>' '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['ruby']),:file_exts=>".rb,.rbw", :default=>"yes"}
 2:@:runners.ruby.debug.curr.inconsole = {:cmd=>"<<RUBY>> -r debug '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.rdebug_selected.title',['ruby']),:file_exts=>".rb,.rbw",:image=>DEBUG_CURRENT_GIF}
-runners.java_file = {:lang=>"java",:cmd=>"javac -g <<FILE>> && java -classpath <<DIR>> <<FILE_BASENAME_WITHOUT_EXT>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.compile_and_run_selected.title',['java']),:file_exts=>".java"}
-runners.python_file = {:lang=>"python",:cmd=>"python '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['python']),:file_exts=>".py", :lang=>"python"} # todo delete file_exts
-runners.generic_file = {:cmd=>"<<FILE>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['generic']),:file_exts=>""}
+runners.java_file = {:lang=>"java",:cmd=>"javac -g <<FILE>> && java -classpath <<DIR>> <<FILE_BASENAME_WITHOUT_EXT>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.compile_and_run_selected.title',['java']),:file_exts=>".java", :default=>"yes"}
+runners.python_file = {:lang=>"python",:cmd=>"python '<<FILE>>'",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['python']),:file_exts=>".py", :lang=>"python", :default=>"yes"} # todo delete file_exts
+runners.generic_file = {:cmd=>"<<FILE>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['generic']),:file_exts=>"", :default=>"yes"}
 #runners.android.new_project = {:cmd=>"android --name <<INPUT_STRING>> --version <<INPUT_STRING>>",:title=>"Test - Create new Android project",:file_exts=>""}

data/ext/ae-editor/ae-editor.rb

@@ -1478,6 +1478,12 @@ class AgEditor
           end
         end
         basename = "~~buffer.java" if basename.nil?        
+      elsif @lang == 'ruby'
+        n=0
+        while File.exist?(File.join(Arcadia.instance.local_dir,"~~buffer#{n}.rb"))
+          n+=1
+        end
+        basename = "~~buffer#{n}.rb"
       else
         n=0
         while File.exist?(File.join(Arcadia.instance.local_dir,"~~buffer#{n}"))
@@ -4408,7 +4414,7 @@ class AgMultiEditor < ArcadiaExtPlus
     _filename = _event.file
     _event.persistent = true
     #if _filename.nil? || _filename == "*CURR"
-    if _filename == "*CURR" || (_filename.nil? && _event && _event.cmd.include?('<<FILE>>'))  
+    if _filename == "*CURR" || (_filename.nil? && _event && _event.cmd.nil?) || (_filename.nil? && _event && !_event.cmd.nil? && _event.cmd.include?('<<FILE>>'))  
       current_editor = self.raised
       if current_editor
         if current_editor.file
@@ -4473,10 +4479,12 @@ class AgMultiEditor < ArcadiaExtPlus
         end
         if runner
           _event.cmd = runner[:cmd]
+          _event.lang = runner[:lang] if _event.lang.nil?
         else
           _event.cmd = _event.file
         end        
       end
+      
       while _event.cmd.include?('<<INPUT_FILE>>')
         input_file = Arcadia.select_file_dialog(MonitorLastUsedDir.get_last_dir, "<<INPUT_FILE>> = ")
         if !input_file.nil?

data/ext/ae-output/ae-output.rb

@@ -317,7 +317,7 @@ class Output < ArcadiaExt
         #if _row >= _from_row
         _end = 0
         #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*\.rb):(\d*)/.match(l)
-        re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z0-9_\-\.]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
+        re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z0-9_\-\.\~]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
         m = re.match(l)
         #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*):(\d*)/.match(l)
         while m

data/ext/ae-shell/ae-shell.rb

@@ -151,8 +151,7 @@ class Shell < ArcadiaExt
         else
           process_name = "#{_event.cmd[0..8]} ..."
         end
-        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as #{_event.lang}...", 'level'=>'info') # info?
-        output_mark = Arcadia.console(self,'msg'=>_event.cmd, 'level'=>'info', 'mark'=>output_mark)
+        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as ... #{_event.lang}", 'level'=>'info') # info?
         start_time = Time.now
         @arcadia['pers']['run.file.last']=_event.file if _event.persistent
         @arcadia['pers']['run.cmd.last']=_event.cmd if _event.persistent

data/lib/a-core.rb

@@ -27,7 +27,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '1.1.0',
+        '1.1.1',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -694,11 +694,11 @@ class Arcadia < TkApplication
     return if root_menu.nil?
     if run[:file_exts]
       run[:file_exts].split(',').each{|ext|
-        self['runners_by_ext'][ext.strip.sub('.','')]=run
+        self['runners_by_ext'][ext.strip.sub('.','')]=run if run[:default]=='yes' || self['runners_by_ext'][ext.strip.sub('.','')].nil?
       }
     end
     if run[:lang]
-      self['runners_by_lang'][run[:lang]]=run
+      self['runners_by_lang'][run[:lang]]=run if run[:default]=='yes' || self['runners_by_lang'][run[:lang]].nil?
     end
     if run[:runner] && self['runners'][run[:runner]]
       run = Hash.new.update(self['runners'][run[:runner]]).update(run)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcadia
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Antonio Galeone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay