arcadia 1.1.0 → 1.1.1

This diff has not been reviewed by any users.
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4611baf00758fb21466c6dfd94cd49d42074dad1
4
- data.tar.gz: f325bd7340e97c3a6ea3138f88294b30073da697
3
+ metadata.gz: 3a8388bee46d269b1298f228ec9f2d0bd879dab3
4
+ data.tar.gz: 4e23af4c7a2e7d5c680eda9cdda8bc5538779d04
5
5
  SHA512:
6
- metadata.gz: f5288b57c81c601457884c1439f22baa190ac1ff4a89664acd5ae4772e398c5c58eedbf69d7973e4c3d03ac69830a0359b87416fd55d2102563c2acb7e7a45ec
7
- data.tar.gz: 118c4e1c57fd930901eaf3188165b51e91284aab52cc60a907c89ffc28b094bffbde84a25bd3785be0386e77e10ec4930525a90f6f2961096e09692ba9c0a44a
6
+ metadata.gz: d5b666fd9c166cfec1eb62b50de3dc1ef9d239d94cec535eaa4a155f6cf03e8bd660ddb32147eeaec9e24e87239556be437e6d5358ac948ee80d17911291196d
7
+ data.tar.gz: 80768548ccd0189066e1fe2ca61a9ccb22d7e30dc23d4a24a13fc03dc45e8da2a1dc347fefa93c86635a309bf528e73aa468b444ce8059201fed73967b288db3
data/README.md CHANGED
@@ -1,8 +1,8 @@
1
1
  # Arcadia IDE
2
- version 1.1.0
2
+ version 1.1.1
3
3
 
4
4
  by Antonio Galeone
5
- on Sep 06, 2015
5
+ on Sep 29, 2015
6
6
 
7
7
  ## About
8
8
 
@@ -26,6 +26,9 @@ Some of Arcadia IDE project features include:
26
26
  [https://github.com/angal/arcadia/wiki]
27
27
 
28
28
  ## News
29
+ [1.1.1] This release:
30
+ - bug fixed [issue https://github.com/angal/arcadia/issues/58]
31
+
29
32
  [1.1.0] This release:
30
33
  - added possibility to define custom runner:
31
34
  go to "run current" menubutton and click on "Manage runner ...". A dialog window will open.
@@ -671,10 +671,10 @@ theme=dark
671
671
 
672
672
  # runners keywords related the current file => FILE, DIR, FILE_BASENAME, FILE_BASENAME_WITHOUT_EXT
673
673
  runners_instance_history=3
674
- 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"}
675
- 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"}
674
+ 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"}
675
+ 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"}
676
676
  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}
677
- 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"}
678
- 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
679
- runners.generic_file = {:cmd=>"<<FILE>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['generic']),:file_exts=>""}
677
+ 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"}
678
+ 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
679
+ runners.generic_file = {:cmd=>"<<FILE>>",:file=>"*CURR",:title=>Arcadia.text('main.runner.run_selected.title',['generic']),:file_exts=>"", :default=>"yes"}
680
680
  #runners.android.new_project = {:cmd=>"android --name <<INPUT_STRING>> --version <<INPUT_STRING>>",:title=>"Test - Create new Android project",:file_exts=>""}
@@ -1478,6 +1478,12 @@ class AgEditor
1478
1478
  end
1479
1479
  end
1480
1480
  basename = "~~buffer.java" if basename.nil?
1481
+ elsif @lang == 'ruby'
1482
+ n=0
1483
+ while File.exist?(File.join(Arcadia.instance.local_dir,"~~buffer#{n}.rb"))
1484
+ n+=1
1485
+ end
1486
+ basename = "~~buffer#{n}.rb"
1481
1487
  else
1482
1488
  n=0
1483
1489
  while File.exist?(File.join(Arcadia.instance.local_dir,"~~buffer#{n}"))
@@ -4408,7 +4414,7 @@ class AgMultiEditor < ArcadiaExtPlus
4408
4414
  _filename = _event.file
4409
4415
  _event.persistent = true
4410
4416
  #if _filename.nil? || _filename == "*CURR"
4411
- if _filename == "*CURR" || (_filename.nil? && _event && _event.cmd.include?('<<FILE>>'))
4417
+ if _filename == "*CURR" || (_filename.nil? && _event && _event.cmd.nil?) || (_filename.nil? && _event && !_event.cmd.nil? && _event.cmd.include?('<<FILE>>'))
4412
4418
  current_editor = self.raised
4413
4419
  if current_editor
4414
4420
  if current_editor.file
@@ -4473,10 +4479,12 @@ class AgMultiEditor < ArcadiaExtPlus
4473
4479
  end
4474
4480
  if runner
4475
4481
  _event.cmd = runner[:cmd]
4482
+ _event.lang = runner[:lang] if _event.lang.nil?
4476
4483
  else
4477
4484
  _event.cmd = _event.file
4478
4485
  end
4479
4486
  end
4487
+
4480
4488
  while _event.cmd.include?('<<INPUT_FILE>>')
4481
4489
  input_file = Arcadia.select_file_dialog(MonitorLastUsedDir.get_last_dir, "<<INPUT_FILE>> = ")
4482
4490
  if !input_file.nil?
@@ -317,7 +317,7 @@ class Output < ArcadiaExt
317
317
  #if _row >= _from_row
318
318
  _end = 0
319
319
  #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*\.rb):(\d*)/.match(l)
320
- re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z0-9_\-\.]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
320
+ re = Regexp.new('([\w\:]*[\.\/]*[\/A-Za-z0-9_\-\.\~]*[\.\/\w\d]*[(<<current buffer>>)]*):(\d*)')
321
321
  m = re.match(l)
322
322
  #m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*):(\d*)/.match(l)
323
323
  while m
@@ -151,8 +151,7 @@ class Shell < ArcadiaExt
151
151
  else
152
152
  process_name = "#{_event.cmd[0..8]} ..."
153
153
  end
154
- output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as #{_event.lang}...", 'level'=>'info') # info?
155
- output_mark = Arcadia.console(self,'msg'=>_event.cmd, 'level'=>'info', 'mark'=>output_mark)
154
+ output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as ... #{_event.lang}", 'level'=>'info') # info?
156
155
  start_time = Time.now
157
156
  @arcadia['pers']['run.file.last']=_event.file if _event.persistent
158
157
  @arcadia['pers']['run.cmd.last']=_event.cmd if _event.persistent
@@ -27,7 +27,7 @@ class Arcadia < TkApplication
27
27
  super(
28
28
  ApplicationParams.new(
29
29
  'arcadia',
30
- '1.1.0',
30
+ '1.1.1',
31
31
  'conf/arcadia.conf',
32
32
  'conf/arcadia.pers'
33
33
  )
@@ -694,11 +694,11 @@ class Arcadia < TkApplication
694
694
  return if root_menu.nil?
695
695
  if run[:file_exts]
696
696
  run[:file_exts].split(',').each{|ext|
697
- self['runners_by_ext'][ext.strip.sub('.','')]=run
697
+ self['runners_by_ext'][ext.strip.sub('.','')]=run if run[:default]=='yes' || self['runners_by_ext'][ext.strip.sub('.','')].nil?
698
698
  }
699
699
  end
700
700
  if run[:lang]
701
- self['runners_by_lang'][run[:lang]]=run
701
+ self['runners_by_lang'][run[:lang]]=run if run[:default]=='yes' || self['runners_by_lang'][run[:lang]].nil?
702
702
  end
703
703
  if run[:runner] && self['runners'][run[:runner]]
704
704
  run = Hash.new.update(self['runners'][run[:runner]]).update(run)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arcadia
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Antonio Galeone
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-06 00:00:00.000000000 Z
11
+ date: 2015-09-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: coderay