Permalink
Browse files

Janus: Even more organisation.

  • Loading branch information...
1 parent cf96aac commit 3f4f18faf35631b63dd98c12372a9471d6ffe352 @kalbasit kalbasit committed Nov 8, 2011
Showing with 96 additions and 82 deletions.
  1. +70 −70 .gitmodules
  2. +2 −2 Rakefile
  3. +14 −0 janus/{lib → ruby}/janus.rb
  4. 0 janus/{lib → ruby}/janus/errors.rb
  5. 0 janus/{lib → ruby}/janus/gems.rb
  6. 0 janus/{lib → ruby}/janus/git.rb
  7. +2 −2 janus/{lib → ruby}/janus/plugins.rb
  8. 0 janus/{lib → ruby}/janus/vim.rb
  9. 0 janus/{ → vim}/colors/sampler-pack
  10. 0 janus/{ → vim}/colors/solarized
  11. +3 −4 janus/{lib/vim → vim/core/janus/before/plugin}/janus.vim
  12. 0 janus/{ → vim}/core/janus/before/plugin/plugins.vim
  13. 0 janus/{core/janus/before/plugin/janus.vim → vim/core/janus/before/plugin/settings.vim}
  14. 0 janus/{ → vim}/core/pathogen
  15. +1 −1 janus/{ → vim}/core/tasks/pathogen.rake
  16. 0 janus/{ → vim}/gvimrc
  17. 0 janus/{ → vim}/langs/coffeescript
  18. 0 janus/{ → vim}/langs/cucumber
  19. 0 janus/{ → vim}/langs/git
  20. 0 janus/{ → vim}/langs/haml
  21. 0 janus/{ → vim}/langs/handlebars
  22. 0 janus/{ → vim}/langs/javascript
  23. 0 janus/{ → vim}/langs/markdown
  24. 0 janus/{ → vim}/langs/puppet
  25. 0 janus/{ → vim}/langs/rails
  26. 0 janus/{ → vim}/langs/rspec
  27. 0 janus/{ → vim}/langs/scala
  28. 0 janus/{ → vim}/langs/scss
  29. 0 janus/{ → vim}/langs/textile
  30. 0 janus/{ → vim}/tools/ack
  31. 0 janus/{ → vim}/tools/command-t
  32. 0 janus/{ → vim}/tools/fugitive
  33. 0 janus/{ → vim}/tools/gundo
  34. 0 janus/{ → vim}/tools/hammer
  35. 0 janus/{ → vim}/tools/janus/after/plugin/NERD_commenter.vim
  36. 0 janus/{ → vim}/tools/janus/after/plugin/ack.vim
  37. 0 janus/{ → vim}/tools/janus/after/plugin/nerdtree.vim
  38. 0 janus/{ → vim}/tools/janus/after/plugin/tagbar.vim
  39. 0 janus/{ → vim}/tools/janus/after/plugin/unimpaired.vim
  40. 0 janus/{ → vim}/tools/janus/after/plugin/zoomwin.vim
  41. 0 janus/{ → vim}/tools/janus/plugin/command-t.vim
  42. 0 janus/{ → vim}/tools/janus/plugin/fugitive.vim
  43. 0 janus/{ → vim}/tools/janus/plugin/gundo.vim
  44. 0 janus/{ → vim}/tools/janus/plugin/hammer.vim
  45. 0 janus/{ → vim}/tools/janus/plugin/syntastic.vim
  46. 0 janus/{ → vim}/tools/matchit
  47. 0 janus/{ → vim}/tools/nerdcommenter
  48. 0 janus/{ → vim}/tools/nerdtree
  49. 0 janus/{ → vim}/tools/pep8
  50. 0 janus/{ → vim}/tools/snipmate
  51. 0 janus/{ → vim}/tools/snipmate-snippets
  52. 0 janus/{ → vim}/tools/supertab
  53. 0 janus/{ → vim}/tools/surround
  54. 0 janus/{ → vim}/tools/syntastic
  55. 0 janus/{ → vim}/tools/tagbar
  56. +1 −1 janus/{ → vim}/tools/tasks/command-t.rake
  57. 0 janus/{ → vim}/tools/tasks/hammer.rake
  58. 0 janus/{ → vim}/tools/tlib
  59. 0 janus/{ → vim}/tools/unimpaired
  60. 0 janus/{ → vim}/tools/vim-addon-mw-utils
  61. 0 janus/{ → vim}/tools/zoomwin
  62. +3 −2 janus/{ → vim}/vimrc
View
@@ -1,112 +1,112 @@
# Core
-[submodule "janus/core/pathogen"]
- path = janus/core/pathogen
+[submodule "janus/vim/core/pathogen"]
+ path = janus/vim/core/pathogen
url = git://github.com/tpope/vim-pathogen.git
# Colors
-[submodule "janus/colors/sampler-pack"]
- path = janus/colors/sampler-pack
+[submodule "janus/vim/colors/sampler-pack"]
+ path = janus/vim/colors/sampler-pack
url = https://github.com/vim-scripts/Color-Sampler-Pack.git
-[submodule "janus/colors/solarized"]
- path = janus/colors/solarized
+[submodule "janus/vim/colors/solarized"]
+ path = janus/vim/colors/solarized
url = git://github.com/altercation/vim-colors-solarized.git
# Langs
-[submodule "janus/langs/haml"]
- path = janus/langs/haml
+[submodule "janus/vim/langs/haml"]
+ path = janus/vim/langs/haml
url = https://github.com/tpope/vim-haml.git
-[submodule "janus/langs/javascript"]
- path = janus/langs/javascript
+[submodule "janus/vim/langs/javascript"]
+ path = janus/vim/langs/javascript
url = https://github.com/pangloss/vim-javascript.git
-[submodule "janus/langs/cucumber"]
- path = janus/langs/cucumber
+[submodule "janus/vim/langs/cucumber"]
+ path = janus/vim/langs/cucumber
url = https://github.com/tpope/vim-cucumber.git
-[submodule "janus/langs/markdown"]
- path = janus/langs/markdown
+[submodule "janus/vim/langs/markdown"]
+ path = janus/vim/langs/markdown
url = https://github.com/tpope/vim-markdown.git
-[submodule "janus/langs/puppet"]
- path = janus/langs/puppet
+[submodule "janus/vim/langs/puppet"]
+ path = janus/vim/langs/puppet
url = https://github.com/ajf/puppet-vim.git
-[submodule "janus/langs/scala"]
- path = janus/langs/scala
+[submodule "janus/vim/langs/scala"]
+ path = janus/vim/langs/scala
url = https://github.com/bdd/vim-scala.git
-[submodule "janus/langs/handlebars"]
- path = janus/langs/handlebars
+[submodule "janus/vim/langs/handlebars"]
+ path = janus/vim/langs/handlebars
url = https://github.com/nono/vim-handlebars.git
-[submodule "janus/langs/coffeescript"]
- path = janus/langs/coffeescript
+[submodule "janus/vim/langs/coffeescript"]
+ path = janus/vim/langs/coffeescript
url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "janus/langs/rails"]
- path = janus/langs/rails
+[submodule "janus/vim/langs/rails"]
+ path = janus/vim/langs/rails
url = git://github.com/tpope/vim-rails.git
-[submodule "janus/langs/git"]
- path = janus/langs/git
+[submodule "janus/vim/langs/git"]
+ path = janus/vim/langs/git
url = git://github.com/tpope/vim-git.git
-[submodule "janus/langs/textile"]
- path = janus/langs/textile
+[submodule "janus/vim/langs/textile"]
+ path = janus/vim/langs/textile
url = git://github.com/timcharper/textile.vim.git
-[submodule "janus/langs/rspec"]
- path = janus/langs/rspec
+[submodule "janus/vim/langs/rspec"]
+ path = janus/vim/langs/rspec
url = git://github.com/taq/vim-rspec.git
-[submodule "janus/langs/scss"]
- path = janus/langs/scss
+[submodule "janus/vim/langs/scss"]
+ path = janus/vim/langs/scss
url = git://github.com/cakebaker/scss-syntax.vim.git
# Tools
-[submodule "janus/tools/unimpaired"]
- path = janus/tools/unimpaired
+[submodule "janus/vim/tools/unimpaired"]
+ path = janus/vim/tools/unimpaired
url = https://github.com/tpope/vim-unimpaired.git
-[submodule "janus/tools/nerdcommenter"]
- path = janus/tools/nerdcommenter
+[submodule "janus/vim/tools/nerdcommenter"]
+ path = janus/vim/tools/nerdcommenter
url = https://github.com/scrooloose/nerdcommenter.git
-[submodule "janus/tools/matchit"]
- path = janus/tools/matchit
+[submodule "janus/vim/tools/matchit"]
+ path = janus/vim/tools/matchit
url = https://github.com/edsono/vim-matchit.git
-[submodule "janus/tools/supertab"]
- path = janus/tools/supertab
+[submodule "janus/vim/tools/supertab"]
+ path = janus/vim/tools/supertab
url = https://github.com/ervandew/supertab.git
-[submodule "janus/tools/zoomwin"]
- path = janus/tools/zoomwin
+[submodule "janus/vim/tools/zoomwin"]
+ path = janus/vim/tools/zoomwin
url = git://github.com/vim-scripts/ZoomWin.git
-[submodule "janus/tools/ack"]
- path = janus/tools/ack
+[submodule "janus/vim/tools/ack"]
+ path = janus/vim/tools/ack
url = git://github.com/mileszs/ack.vim.git
-[submodule "janus/tools/fugitive"]
- path = janus/tools/fugitive
+[submodule "janus/vim/tools/fugitive"]
+ path = janus/vim/tools/fugitive
url = git://github.com/tpope/vim-fugitive.git
-[submodule "janus/tools/gundo"]
- path = janus/tools/gundo
+[submodule "janus/vim/tools/gundo"]
+ path = janus/vim/tools/gundo
url = git://github.com/sjl/gundo.vim.git
-[submodule "janus/tools/surround"]
- path = janus/tools/surround
+[submodule "janus/vim/tools/surround"]
+ path = janus/vim/tools/surround
url = git://github.com/tpope/vim-surround.git
-[submodule "janus/tools/hammer"]
- path = janus/tools/hammer
+[submodule "janus/vim/tools/hammer"]
+ path = janus/vim/tools/hammer
url = git://github.com/robgleeson/hammer.vim.git
-[submodule "janus/tools/command-t"]
- path = janus/tools/command-t
+[submodule "janus/vim/tools/command-t"]
+ path = janus/vim/tools/command-t
url = git@github.com:wycats/Command-T.git
-[submodule "janus/tools/snipmate"]
- path = janus/tools/snipmate
+[submodule "janus/vim/tools/snipmate"]
+ path = janus/vim/tools/snipmate
url = git://github.com/garbas/vim-snipmate.git
-[submodule "janus/tools/tlib"]
- path = janus/tools/tlib
+[submodule "janus/vim/tools/tlib"]
+ path = janus/vim/tools/tlib
url = git://github.com/tomtom/tlib_vim.git
-[submodule "janus/tools/vim-addon-mw-utils"]
- path = janus/tools/vim-addon-mw-utils
+[submodule "janus/vim/tools/vim-addon-mw-utils"]
+ path = janus/vim/tools/vim-addon-mw-utils
url = git://github.com/MarcWeber/vim-addon-mw-utils.git
-[submodule "janus/tools/snipmate-snippets"]
- path = janus/tools/snipmate-snippets
+[submodule "janus/vim/tools/snipmate-snippets"]
+ path = janus/vim/tools/snipmate-snippets
url = git://github.com/honza/snipmate-snippets.git
-[submodule "janus/tools/syntastic"]
- path = janus/tools/syntastic
+[submodule "janus/vim/tools/syntastic"]
+ path = janus/vim/tools/syntastic
url = git://github.com/scrooloose/syntastic.git
-[submodule "janus/tools/tagbar"]
- path = janus/tools/tagbar
+[submodule "janus/vim/tools/tagbar"]
+ path = janus/vim/tools/tagbar
url = git://github.com/majutsushi/tagbar.git
-[submodule "janus/tools/nerdtree"]
- path = janus/tools/nerdtree
+[submodule "janus/vim/tools/nerdtree"]
+ path = janus/vim/tools/nerdtree
url = git://github.com/scrooloose/nerdtree.git
-[submodule "janus/tools/pep8"]
- path = janus/tools/pep8
+[submodule "janus/vim/tools/pep8"]
+ path = janus/vim/tools/pep8
url = git://github.com/jbking/vim-pep8.git
View
@@ -1,5 +1,5 @@
ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'janus'))
-$: << File.join(ROOT_PATH, 'lib')
+$: << File.join(ROOT_PATH, 'ruby')
require 'janus'
include Janus
@@ -9,7 +9,7 @@ task :link_vim_conf_files do
%w[ vimrc gvimrc ].each do |file|
dest = expand("~/.#{file}")
unless File.exist?(dest)
- ln_s(expand("../janus/#{file}", __FILE__), dest)
+ ln_s(expand("../janus/vim/#{file}", __FILE__), dest)
end
end
end
@@ -6,6 +6,20 @@ def root_path
ROOT_PATH
end
+ # Return the vim's path
+ #
+ # @return [String] The absolute path to ViM files
+ def vim_path
+ File.join ROOT_PATH, 'vim'
+ end
+
+ # Return the ruby's path
+ #
+ # @return [String] The absolute path to Ruby files
+ def ruby_path
+ File.join ROOT_PATH, 'ruby'
+ end
+
# Expand the path of a given file
#
# @param [Array] args
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -4,7 +4,7 @@ module Janus
def self.included(base)
# Load all plugin installation tasks
- Dir["#{root_path}/*/tasks/**.rake"].each do |f|
+ Dir["#{vim_path}/*/tasks/**.rake"].each do |f|
base.send :import, f
end
end
@@ -20,7 +20,7 @@ def install_vim_plugin(group, name, &block)
# Create a namespace for the plugin
namespace(name) do
task :verify_plugin do
- unless Dir["#{root_path}/#{group}/#{name}/**"].any?
+ unless Dir["#{vim_path}/#{group}/#{name}/**"].any?
abort "The submodule #{group}/#{name} is not ready, please run 'git submodule update --init'"
end
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,6 @@
-if exists("g:janus_loaded")
- finish
-endif
-let g:janus_loaded = 1
+""
+"" Janus main functions
+""
" Add a group of plug-ins to Pathogen
"
File renamed without changes.
@@ -1,6 +1,6 @@
install_vim_plugin "core", "pathogen" do
unless File.exists?("autoload/pathogen.vim")
mkdir_p "autoload"
- ln_s "../janus/core/pathogen/autoload/pathogen.vim", "autoload/pathogen.vim"
+ ln_s "#{root_path}/core/pathogen/autoload/pathogen.vim", "autoload/pathogen.vim"
end
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
install_vim_plugin "tools", "command-t" do
- Dir.chdir "#{root_path}/tools/command-t/ruby/command-t" do
+ Dir.chdir "#{vim_path}/tools/command-t/ruby/command-t" do
if File.exists?("/usr/bin/ruby1.8") # prefer 1.8 on *.deb systems
sh "/usr/bin/ruby1.8 extconf.rb"
elsif File.exists?("/usr/bin/ruby") # prefer system rubies
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -5,8 +5,9 @@
" Define the janus_path
let g:janus_path = fnamemodify(resolve(expand("<sfile>:p")), ":h")
-" Source janus
-source ~/.vim/janus/lib/vim/janus.vim
+" Source janus's core
+source ~/.vim/janus/vim/core/pathogen/autoload/pathogen.vim
+source ~/.vim/janus/vim/core/janus/before/plugin/janus.vim
""
"" Customisations

0 comments on commit 3f4f18f

Please sign in to comment.