Permalink
Browse files

minor

  • Loading branch information...
alexcepoi committed Jun 27, 2011
1 parent 771c70e commit db079a849ccdb4d3ee401166ff1572bfe55692c9
Showing with 20 additions and 18,014 deletions.
  1. +3 −0 .gitmodules
  2. +16 −6 init.el
  3. +1 −0 ruby/rinari
  4. +0 −3 ruby/rinari/.gitignore
  5. +0 −6 ruby/rinari/.gitmodules
  6. +0 −17 ruby/rinari/README
  7. +0 −187 ruby/rinari/Rakefile
  8. +0 −538 ruby/rinari/TODO
  9. +0 −2 ruby/rinari/doc/.gitignore
  10. +0 −512 ruby/rinari/doc/rinari.texi
  11. +0 −554 ruby/rinari/rinari-merb.el
  12. +0 −738 ruby/rinari/rinari.el
  13. +0 −1 ruby/rinari/test/.gitignore
  14. +0 −338 ruby/rinari/test/elunit.el
  15. +0 −100 ruby/rinari/test/init.el
  16. +0 −256 ruby/rinari/test/rails-app/README
  17. +0 −10 ruby/rinari/test/rails-app/Rakefile
  18. +0 −10 ruby/rinari/test/rails-app/app/controllers/application.rb
  19. +0 −10 ruby/rinari/test/rails-app/app/controllers/example_controller.rb
  20. +0 −2 ruby/rinari/test/rails-app/app/controllers/newone_controller.rb
  21. +0 −7 ruby/rinari/test/rails-app/app/controllers/units_controller.rb
  22. +0 −3 ruby/rinari/test/rails-app/app/helpers/application_helper.rb
  23. +0 −2 ruby/rinari/test/rails-app/app/helpers/example_helper.rb
  24. +0 −2 ruby/rinari/test/rails-app/app/helpers/newone_helper.rb
  25. +0 −2 ruby/rinari/test/rails-app/app/helpers/units_helper.rb
  26. +0 −7 ruby/rinari/test/rails-app/app/models/example.rb
  27. +0 −1 ruby/rinari/test/rails-app/app/views/example/show.rhtml
  28. +0 −1 ruby/rinari/test/rails-app/app/views/example/write.rhtml
  29. +0 −1 ruby/rinari/test/rails-app/app/views/units/fall.html.erb
  30. +0 −109 ruby/rinari/test/rails-app/config/boot.rb
  31. +0 −19 ruby/rinari/test/rails-app/config/database.yml
  32. +0 −67 ruby/rinari/test/rails-app/config/environment.rb
  33. +0 −17 ruby/rinari/test/rails-app/config/environments/development.rb
  34. +0 −22 ruby/rinari/test/rails-app/config/environments/production.rb
  35. +0 −22 ruby/rinari/test/rails-app/config/environments/test.rb
  36. +0 −10 ruby/rinari/test/rails-app/config/initializers/inflections.rb
  37. +0 −5 ruby/rinari/test/rails-app/config/initializers/mime_types.rb
  38. +0 −15 ruby/rinari/test/rails-app/config/initializers/new_rails_defaults.rb
  39. +0 −41 ruby/rinari/test/rails-app/config/routes.rb
  40. 0 ruby/rinari/test/rails-app/db/test.sqlite3
  41. +0 −2 ruby/rinari/test/rails-app/doc/README_FOR_APP
  42. 0 ruby/rinari/test/rails-app/log/development.log
  43. 0 ruby/rinari/test/rails-app/log/production.log
  44. 0 ruby/rinari/test/rails-app/log/server.log
  45. 0 ruby/rinari/test/rails-app/log/test.log
  46. +0 −30 ruby/rinari/test/rails-app/public/404.html
  47. +0 −30 ruby/rinari/test/rails-app/public/422.html
  48. +0 −30 ruby/rinari/test/rails-app/public/500.html
  49. +0 −10 ruby/rinari/test/rails-app/public/dispatch.cgi
  50. +0 −24 ruby/rinari/test/rails-app/public/dispatch.fcgi
  51. +0 −10 ruby/rinari/test/rails-app/public/dispatch.rb
  52. 0 ruby/rinari/test/rails-app/public/favicon.ico
  53. BIN ruby/rinari/test/rails-app/public/images/rails.png
  54. +0 −274 ruby/rinari/test/rails-app/public/index.html
  55. +0 −2 ruby/rinari/test/rails-app/public/javascripts/application.js
  56. +0 −963 ruby/rinari/test/rails-app/public/javascripts/controls.js
  57. +0 −972 ruby/rinari/test/rails-app/public/javascripts/dragdrop.js
  58. +0 −1,120 ruby/rinari/test/rails-app/public/javascripts/effects.js
  59. +0 −4,225 ruby/rinari/test/rails-app/public/javascripts/prototype.js
  60. +0 −5 ruby/rinari/test/rails-app/public/robots.txt
  61. +0 −3 ruby/rinari/test/rails-app/script/about
  62. +0 −3 ruby/rinari/test/rails-app/script/console
  63. +0 −3 ruby/rinari/test/rails-app/script/dbconsole
  64. +0 −3 ruby/rinari/test/rails-app/script/destroy
  65. +0 −3 ruby/rinari/test/rails-app/script/generate
  66. +0 −3 ruby/rinari/test/rails-app/script/performance/benchmarker
  67. +0 −3 ruby/rinari/test/rails-app/script/performance/profiler
  68. +0 −3 ruby/rinari/test/rails-app/script/performance/request
  69. +0 −3 ruby/rinari/test/rails-app/script/plugin
  70. +0 −3 ruby/rinari/test/rails-app/script/process/inspector
  71. +0 −3 ruby/rinari/test/rails-app/script/process/reaper
  72. +0 −3 ruby/rinari/test/rails-app/script/process/spawner
  73. +0 −3 ruby/rinari/test/rails-app/script/runner
  74. +0 −3 ruby/rinari/test/rails-app/script/server
  75. +0 −7 ruby/rinari/test/rails-app/test/fixtures/examples.yml
  76. +0 −7 ruby/rinari/test/rails-app/test/fixtures/newones.yml
  77. +0 −8 ruby/rinari/test/rails-app/test/functional/example_controller_test.rb
  78. +0 −8 ruby/rinari/test/rails-app/test/functional/newone_controller_test.rb
  79. +0 −10 ruby/rinari/test/rails-app/test/functional/units_controller_test.rb
  80. +0 −38 ruby/rinari/test/rails-app/test/test_helper.rb
  81. +0 −10 ruby/rinari/test/rails-app/test/unit/example_test.rb
  82. +0 −8 ruby/rinari/test/rails-app/test/unit/newone_test.rb
  83. +0 −213 ruby/rinari/util/cucumber-mode-compilation.el
  84. +0 −350 ruby/rinari/util/inf-ruby.el
  85. +0 −1 ruby/rinari/util/jump/.gitignore
  86. +0 −12 ruby/rinari/util/jump/README
  87. +0 −24 ruby/rinari/util/jump/Rakefile
  88. +0 −258 ruby/rinari/util/jump/findr.el
  89. +0 −151 ruby/rinari/util/jump/inflections.el
  90. +0 −312 ruby/rinari/util/jump/jump.el
  91. +0 −338 ruby/rinari/util/jump/test/elunit.el
  92. +0 −107 ruby/rinari/util/jump/test/init.el
  93. +0 −7 ruby/rinari/util/jump/test/jump-fake-app/animals/chicken.rb
  94. +0 −19 ruby/rinari/util/jump/test/jump-fake-app/animals/pig.rb
  95. +0 −19 ruby/rinari/util/jump/test/jump-fake-app/foods/pork.rb
  96. +0 −317 ruby/rinari/util/jump/which-func.el
  97. +0 −30 ruby/rinari/util/ruby-compilation-rspec.el
  98. +0 −303 ruby/rinari/util/ruby-compilation.el
  99. +0 −1,428 ruby/rinari/util/ruby-mode.el
  100. +0 −1 ruby/rinari/util/test/ert/.gitignore
  101. +0 −22 ruby/rinari/util/test/ert/TODO
  102. +0 −99 ruby/rinari/util/test/ert/ert-functional.el
  103. +0 −1,578 ruby/rinari/util/test/ert/ert.el
  104. +0 −309 ruby/rinari/util/test/ert/ert.texinfo
  105. +0 −3 ruby/rinari/util/test/ert/test/badly-indented.el
  106. +0 −594 ruby/rinari/util/test/ert/test/ert-selftests.el
  107. +0 −2 ruby/rinari/util/test/ert/test/well-indented.el
  108. +0 −39 ruby/rinari/util/test/ruby-mode-test.el
View
@@ -0,0 +1,3 @@
+[submodule "ruby/rinari"]
+ path = ruby/rinari
+ url = git://github.com/eschulte/rinari.git
View
22 init.el
@@ -13,10 +13,10 @@
;; LOOK and FEEL
(add-to-list 'default-frame-alist '(font . "Monospace-10"))
-(add-to-list 'default-frame-alist '(top . 70))
-(add-to-list 'default-frame-alist '(left . 30))
+;;(add-to-list 'default-frame-alist '(top . 70))
+;;(add-to-list 'default-frame-alist '(left . 30))
(add-to-list 'default-frame-alist '(height . 50))
-(add-to-list 'default-frame-alist '(width . 150))
+(add-to-list 'default-frame-alist '(width . 140))
(tool-bar-mode -1)
(set-scroll-bar-mode 'right)
@@ -36,8 +36,8 @@
(color-theme-initialize)
(add-to-list 'load-path "~/.emacs.d/themes")
-(require 'railscasts)
-(color-theme-railscasts)
+;;(require 'railscasts)
+;;(color-theme-railscasts)
(set-cursor-color "gray30")
(set-face-attribute 'mode-line nil
@@ -85,6 +85,7 @@
;; LINE NUMBERS
(setq linum-format "%4d")
(setq column-number-mode t)
+(setq fill-column 100)
;; IDO MODE
(require 'ido)
@@ -136,12 +137,20 @@ global-semantic-stickyfunc-mode))
(setq-default c-default-style "bsd")
;;(add-hook 'c-mode-common-hook '(lambda() (setq tab-width 4)))
+;; SHEBANG
+(add-to-list 'interpreter-mode-alist '("ruby1.9" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("python2.6" . python-mode))
+
;; LATEX
(add-hook 'LaTeX-mode-hook (lambda()
(add-to-list 'TeX-command-list '("XeLaTeX" "%`xelatex%(mode)%' %t" TeX-run-TeX nil t))
(setq TeX-command-default "XeLaTeX")
(setq TeX-save-query nil)
(setq TeX-show-compilation t)))
+(add-hook 'LaTeX-mode-hook 'LaTeX-math-mode)
+(add-hook 'LaTeX-mode-hook 'company-mode)
+(add-hook 'LaTeX-mode-hook 'flyspell-mode)
+(add-hook 'LaTeX-mode-hook 'turn-on-auto-fill)
(setq TeX-PDF-mode t)
(defun pdfevince ()
@@ -191,7 +200,8 @@ global-semantic-stickyfunc-mode))
(setq ecb-tip-of-the-day nil)
(setq ecb-create-layout-file "~/.emacs.d/ecb-user-layouts.el")
-(setq ecb-layout-name "leftright-custom")
+;;(setq ecb-layout-name "leftright-custom")
+(setq ecb-layout-name "left13")
(setq ecb-fix-window-size (quote width))
(setq ecb-windows-width 30)
(setq ecb-show-sources-in-directories-buffer (quote ("left7" "left13" "left14" "left15" "leftright-custom")))
Submodule rinari added at f6f36a
View
@@ -1,3 +0,0 @@
-*~
-*.elc
-ELPA
View
@@ -1,6 +0,0 @@
-[submodule "util/jump"]
- path = util/jump
- url = git://github.com/eschulte/jump.el.git
-[submodule "util/test/ert"]
- path = util/test/ert
- url = git://github.com/nex3/ert.git
View
@@ -1,17 +0,0 @@
-Rinari Is Not A Ruby IDE.
-
-Well, ok it kind of is. Rinari is an Emacs minor mode that is aimed
-towards making Emacs into a top-notch Ruby and Rails development
-environment.
-
-For a screencast of Rinari see
-http://vimeo.com/2854412
-
-For the latest version see
-http://github.com/eschulte/rinari/tree/master
-
-For instillation instruction and documentation see
-http://rinari.rubyforge.org
-
-For discussion of Ruby on Rails related Emacs development see
-http://groups.google.com/group/emacs-on-rails
View
@@ -1,187 +0,0 @@
-require 'readline'
-require 'find'
-
-MYDIR = File.dirname(__FILE__)
-DOCDIR = "#{MYDIR}/doc"
-TESTDIR = "#{MYDIR}/test"
-
-desc "extract and clean files for submission to ELPA"
-task :elpa do
- elpa_dir = File.join(MYDIR, "ELPA")
- FileUtils.rm_rf(elpa_dir) if File.exists?(elpa_dir)
- FileUtils.mkdir(elpa_dir)
- ["rinari.el",
- File.join("util", "ruby-mode.el"),
- File.join("util", "inf-ruby.el"),
- File.join("util", "ruby-compilation.el")].each do |file|
- FileUtils.cp(file, elpa_dir)
- file = File.join(elpa_dir, File.basename(file))
- contents = File.read(file)
- File.open(file, 'w') do |f|
- f.write(contents.gsub(/;;;\#\#\#begin-elpa-ignore[\s\S]+;;;\#\#\#end-elpa-ignore[\r\n]/m, ''))
- end
- end
-end
-
-namespace "test" do
-
- desc "Run tests using `emacs-snapshot'"
- task :snapshot do
- system "emacs-snapshot -Q -l #{TESTDIR}/init.el"
- end
-
- desc "Run tests using `emacs-22'"
- task :twenty_two do
- system "emacs22 -Q -l #{TESTDIR}/init.el"
- end
-
- desc "Run tests using `emacs'"
- task :emacs do
- system "emacs -Q -l #{TESTDIR}/init.el"
- end
-
-end
-
-namespace "doc" do
-
- desc "Compile the html documentation"
- task :make_html do
- system "makeinfo --html #{DOCDIR}/rinari.texi"
- end
-
- desc "Compile info documentation"
- task :make_info do
- system "makeinfo #{DOCDIR}/rinari.texi"
- end
-
- desc "Install info documentation"
- task :install_info => :make_info do
- system "sudo install-info #{DOCDIR}/rinari.info"
- end
-
- desc "Remove compiled documentation"
- task :clean do
- system "rm -rf #{DOCDIR}/rinari" if FileTest.exists? "#{DOCDIR}/rinari"
- system "rm #{DOCDIR}/rinari.info" if FileTest.exists? "#{DOCDIR}/rinari.info"
- end
-
-end
-
-task :default => :'test:emacs'
-
-# some git tasks taken from the rubinius
-def git_branch
- `git branch | grep "*"`.strip[2..-1]
-end
-
-def compare_git_ver
- m = /git version (\d+).(\d+).(\d+)/.match(`git version`.strip)
- return true if m[1].to_i > 1
- return false if m[1].to_i < 1
- return true if m[2].to_i > 5
- return false if m[2].to_i < 5
- return true if m[3].to_i >= 3
- return false
-end
-
-def check_git_ver
- raise "Invalid git version, use at least 1.5.3" unless compare_git_ver
-end
-
-namespace :git do
-
- desc "Show the current status of the checkout"
- task :status do
- system "git status"
- end
-
- desc "Create a new topic branch"
- task :topic do
- total = `git branch`.scan("quick").size
- if total == 0
- default = "quick"
- else
- default = "quick#{total + 1}"
- end
- name = Readline.readline "Topic name (default #{default}): "
- if name.strip.empty?
- name = default
- end
- sh "git checkout -b #{name}"
- end
-
- desc "Push all changes to the repository"
- task :push => :update do
- branch = git_branch()
- if branch != "master"
- `git diff-files --quiet`
- if $?.exitstatus == 1
- puts "You have outstanding changes. Please commit them first."
- exit 1
- end
-
- puts "* Merging topic '#{branch}' back into master..."
- `git checkout master`
- sh "git merge #{branch}"
- switch = true
- else
- switch = false
- end
-
- puts "* Pushing changes..."
- sh "git push"
-
- if switch
- puts "* Switching back to #{branch}..."
- `git checkout #{branch}`
- end
- end
-
- desc "Pull new commits from the repository"
- task :update do
- check_git_ver
- `git diff-files --quiet`
- if $?.exitstatus == 1
- stash = true
- clear = `git stash list`.scan("\n").size == 0
- puts "* Saving changes..."
- `git stash save`
- else
- stash = false
- end
-
- branch = git_branch()
- if branch != "master"
- switch = true
- `git checkout master`
- puts "* Switching back to master..."
- else
- switch = false
- end
-
- puts "* Pulling in new commits..."
- sh "git fetch"
- sh "git rebase origin"
-
- if switch
- puts "* Porting changes into #{branch}..."
- `git checkout #{branch}`
- sh "git rebase master"
- end
-
- if stash
- puts "* Applying changes..."
- sh "git stash apply"
- `git stash clear` if clear
- end
- end
-
- task :pull => :update
-
- desc "remove all .git folders from the directory"
- task :clean do
- Find.find("./"){|f| FileUtils.rm_rf(f) if f =~ /\.git.*/}
- end
-
-end
-# end some git tasks taken from the rubinius
Oops, something went wrong.

0 comments on commit db079a8

Please sign in to comment.