diff -Nru vim-addon-manager-0.5.2/.mailmap vim-addon-manager-0.5.3/.mailmap --- vim-addon-manager-0.5.2/.mailmap 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/.mailmap 2012-10-31 21:38:26.000000000 +0000 @@ -0,0 +1 @@ +James McCoy diff -Nru vim-addon-manager-0.5.2/Rakefile vim-addon-manager-0.5.3/Rakefile --- vim-addon-manager-0.5.2/Rakefile 2012-01-31 23:31:06.000000000 +0000 +++ vim-addon-manager-0.5.3/Rakefile 2012-11-01 00:22:28.000000000 +0000 @@ -1,9 +1,26 @@ +desc 'run all the tests' task :default => [:rspec, :cucumber] +desc 'run unit tests' task :rspec do ruby '-S rspec --color spec' end +desc 'run acceptance tests' task :cucumber do ruby '-S cucumber --format progress' end + +html = FileList['doc/*.markdown'].gsub(/\.markdown$/, '.html') + +desc 'build documentation' +task :doc => html + +rule '.html' => ['.markdown', 'doc/template.html'] do |t| + sh %{pandoc --smart -f markdown --section-divs -t html5 --template=doc/template.html -o #{t.name} #{t.source}} +end + +desc 'remove generated files' +task :clean do + rm_f html +end diff -Nru vim-addon-manager-0.5.2/bin/vim-addon-manager vim-addon-manager-0.5.3/bin/vim-addon-manager --- vim-addon-manager-0.5.2/bin/vim-addon-manager 2012-06-04 22:12:06.000000000 +0000 +++ vim-addon-manager-0.5.3/bin/vim-addon-manager 2013-12-03 12:03:36.000000000 +0000 @@ -155,6 +155,7 @@ =end +require 'etc' require 'getoptlong' require 'vim/addon_manager' @@ -198,7 +199,7 @@ :registry_dir => '/usr/share/vim/registry', :source_dir => '/usr/share/vim/addons', :system_dir => '/var/lib/vim/addons', - :target_dir => File.join(ENV['HOME'], '.vim'), + :target_dir => File.join(ENV['HOME'] || (Etc.getpwnam Etc.getlogin).dir, '.vim'), :query => false, :system_wide => false, } diff -Nru vim-addon-manager-0.5.2/debian/changelog vim-addon-manager-0.5.3/debian/changelog --- vim-addon-manager-0.5.2/debian/changelog 2012-10-30 17:52:14.000000000 +0000 +++ vim-addon-manager-0.5.3/debian/changelog 2013-12-03 17:43:49.000000000 +0000 @@ -1,3 +1,18 @@ +vim-addon-manager (0.5.3) unstable; urgency=low + + [ James McCoy ] + * Use a standard directory mode when installing an addon as root. (Closes: + #680624) + * Fallback to using getent if $HOME isn't set. Thanks to Helmut Grohne for + the patch. (Closes: #726329) + * Write each element of override_lines to 000-vim-addons.vim instead of a + stringified version of the array. (Closes: #731191) + * Lintian: + - ancient-standards-version: Bump to 3.9.5, no changes needed. + - vcs-field-not-canonical: Update Vcs-* to canoncial URLs. + + -- Antonio Terceiro Tue, 03 Dec 2013 14:43:47 -0300 + vim-addon-manager (0.5.2) unstable; urgency=low * New upload to remove `tags` file accidentally included in the source diff -Nru vim-addon-manager-0.5.2/debian/control vim-addon-manager-0.5.3/debian/control --- vim-addon-manager-0.5.2/debian/control 2012-06-04 22:50:08.000000000 +0000 +++ vim-addon-manager-0.5.3/debian/control 2013-12-03 12:03:36.000000000 +0000 @@ -2,11 +2,11 @@ Section: editors Priority: extra Maintainer: Debian Vim Maintainers -Uploaders: Antonio Terceiro +Uploaders: Antonio Terceiro , James McCoy Build-Depends: debhelper (>= 7.0.50~), rdtool, gem2deb (>= 0.2.13~), rake, cucumber, ruby-rspec, vim-common -Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-vim/vim-addon-manager.git -Vcs-Browser: http://git.debian.org/?p=pkg-vim/vim-addon-manager.git +Standards-Version: 3.9.5 +Vcs-Git: git://anonscm.debian.org/pkg-vim/vim-addon-manager.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-vim/vim-addon-manager.git XS-Ruby-Versions: all Package: vim-addon-manager diff -Nru vim-addon-manager-0.5.2/debian/ruby-tests.rake vim-addon-manager-0.5.3/debian/ruby-tests.rake --- vim-addon-manager-0.5.2/debian/ruby-tests.rake 2012-01-31 23:31:06.000000000 +0000 +++ vim-addon-manager-0.5.3/debian/ruby-tests.rake 2012-11-01 00:22:28.000000000 +0000 @@ -1,9 +1,26 @@ +desc 'run all the tests' task :default => [:rspec, :cucumber] +desc 'run unit tests' task :rspec do ruby '-S rspec --color spec' end +desc 'run acceptance tests' task :cucumber do ruby '-S cucumber --format progress' end + +html = FileList['doc/*.markdown'].gsub(/\.markdown$/, '.html') + +desc 'build documentation' +task :doc => html + +rule '.html' => ['.markdown', 'doc/template.html'] do |t| + sh %{pandoc --smart -f markdown --section-divs -t html5 --template=doc/template.html -o #{t.name} #{t.source}} +end + +desc 'remove generated files' +task :clean do + rm_f html +end Binary files /tmp/nePZUycp82/vim-addon-manager-0.5.2/doc/img/debian.png and /tmp/KgLrs47GrU/vim-addon-manager-0.5.3/doc/img/debian.png differ Binary files /tmp/nePZUycp82/vim-addon-manager-0.5.2/doc/img/rubygems.png and /tmp/KgLrs47GrU/vim-addon-manager-0.5.3/doc/img/rubygems.png differ diff -Nru vim-addon-manager-0.5.2/doc/index.markdown vim-addon-manager-0.5.3/doc/index.markdown --- vim-addon-manager-0.5.2/doc/index.markdown 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/doc/index.markdown 2012-11-01 00:46:28.000000000 +0000 @@ -0,0 +1,46 @@ +# vim-addon-manager + +## Installation + +If you use [Debian](http://debian.org/) (or any derivative), you can install +from the Debian repository. + +```debian +$ apt-get install vim-addon-manager +``` + +On other systems, you can install vim-addon-manager using [Rubygems](http://rubygems.org/): + +```rubygems +$ gem install vim-addon-manager +``` + +## Usage + +Addon installation: + +```shell +$ vam install tetris # from vim-scripts package on Debian +$ vam install https://github.com/user/extension.git # from git repository +``` + +Checking the status of your addons: + +```shell +$ vam status +# Name User Status System Status +align installed removed +alternate removed removed +bufexplorer removed removed +calendar removed removed +closetag removed removed +[...] +``` + +Removing installed addons: + +```shell +$ vam remove tetris +``` + +For more in-depth information, check the [documentation](documentation.html). diff -Nru vim-addon-manager-0.5.2/doc/local.css vim-addon-manager-0.5.3/doc/local.css --- vim-addon-manager-0.5.2/doc/local.css 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/doc/local.css 2012-11-01 00:39:19.000000000 +0000 @@ -0,0 +1,17 @@ +body { + padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ +} + +#vim-addon-manager #installation pre, pre.shell { + background: black; + color: white; +} +#vim-addon-manager #installation pre { + margin-left: 48px; +} +#vim-addon-manager #installation div.debian { + background: 0px 50% url(img/debian.png) no-repeat; +} +#vim-addon-manager #installation div.rubygems { + background: 0px 50% url(img/rubygems.png) no-repeat; +} diff -Nru vim-addon-manager-0.5.2/doc/local.js vim-addon-manager-0.5.3/doc/local.js --- vim-addon-manager-0.5.2/doc/local.js 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/doc/local.js 2012-11-01 00:08:08.000000000 +0000 @@ -0,0 +1,12 @@ +jQuery(function($) { + var current_page = window.location.pathname + if (current_page == '/index.html') { + current_page = '/' + } + $('.nav a[href="' + current_page + '"]').closest('li').addClass('active'); + + $('.debian, .rubygems').each(function() { + $(this).wrap('
'); + }); + +}); diff -Nru vim-addon-manager-0.5.2/doc/template.html vim-addon-manager-0.5.3/doc/template.html --- vim-addon-manager-0.5.2/doc/template.html 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/doc/template.html 2012-11-01 00:36:55.000000000 +0000 @@ -0,0 +1,73 @@ + + + + + + +$for(author-meta)$ + +$endfor$ +$if(date-meta)$ + +$endif$ + $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ + + + +$if(highlighting-css)$ + +$endif$ +$for(css)$ + +$endfor$ +$if(math)$ + $math$ +$endif$ +$for(header-includes)$ + $header-includes$ +$endfor$ + + +
+
+
+ + + + + + Vim Addon Manager +
+ +
+
+
+
+ + +$for(include-before)$ +$include-before$ +$endfor$ +
+$if(toc)$ +
+$toc$ +
+$endif$ +$body$ +
+$for(include-after)$ +$include-after$ +$endfor$ + + + + diff -Nru vim-addon-manager-0.5.2/features/step_definitions/steps.rb vim-addon-manager-0.5.3/features/step_definitions/steps.rb --- vim-addon-manager-0.5.2/features/step_definitions/steps.rb 2012-07-17 00:33:28.000000000 +0000 +++ vim-addon-manager-0.5.3/features/step_definitions/steps.rb 2012-11-01 00:48:32.000000000 +0000 @@ -59,7 +59,7 @@ end Given /^(.*) is installed$/ do |addon| - Given "I run `vim-addons install #{addon}`" + step "I run `vim-addons install #{addon}`" end Then /^(.*) should not be installed anymore$/ do |addon| diff -Nru vim-addon-manager-0.5.2/lib/vim/addon_manager/addon/directory.rb vim-addon-manager-0.5.3/lib/vim/addon_manager/addon/directory.rb --- vim-addon-manager-0.5.2/lib/vim/addon_manager/addon/directory.rb 2012-03-14 01:51:16.000000000 +0000 +++ vim-addon-manager-0.5.3/lib/vim/addon_manager/addon/directory.rb 2013-12-03 12:03:36.000000000 +0000 @@ -32,7 +32,7 @@ def install(target_dir) dest = destination(target_dir) - FileUtils.mkdir_p(File.dirname(dest)) + self.mkdir(dest) FileUtils.ln_sf(source, dest) files end diff -Nru vim-addon-manager-0.5.2/lib/vim/addon_manager/addon/legacy.rb vim-addon-manager-0.5.3/lib/vim/addon_manager/addon/legacy.rb --- vim-addon-manager-0.5.2/lib/vim/addon_manager/addon/legacy.rb 2012-02-01 12:56:06.000000000 +0000 +++ vim-addon-manager-0.5.3/lib/vim/addon_manager/addon/legacy.rb 2013-12-03 12:03:36.000000000 +0000 @@ -56,8 +56,7 @@ installed_files = [] symlink = lambda do |file| dest = File.join(target_dir, file) - dest_dir = File.dirname dest - FileUtils.mkdir_p dest_dir + self.mkdir(dest) FileUtils.ln_sf(File.join(basedir, file), dest) end status = self.status(target_dir) diff -Nru vim-addon-manager-0.5.2/lib/vim/addon_manager/addon.rb vim-addon-manager-0.5.3/lib/vim/addon_manager/addon.rb --- vim-addon-manager-0.5.2/lib/vim/addon_manager/addon.rb 2012-03-14 01:37:43.000000000 +0000 +++ vim-addon-manager-0.5.3/lib/vim/addon_manager/addon.rb 2013-12-03 12:03:36.000000000 +0000 @@ -61,6 +61,15 @@ AddonStatus.new :unkonwn end + def mkdir(dest) + dest_dir = File.dirname dest + if Process.euid == 0 + FileUtils.mkdir_p dest_dir, :mode => 0755 + else + FileUtils.mkdir_p dest_dir + end + end + # Installs addon files into +target_dir+ and returns a list of installed # files. # diff -Nru vim-addon-manager-0.5.2/lib/vim/addon_manager/version.rb vim-addon-manager-0.5.3/lib/vim/addon_manager/version.rb --- vim-addon-manager-0.5.2/lib/vim/addon_manager/version.rb 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/lib/vim/addon_manager/version.rb 2013-12-03 17:44:19.000000000 +0000 @@ -0,0 +1,5 @@ +module Vim + class AddonManager + VERSION = '0.5.3' + end +end diff -Nru vim-addon-manager-0.5.2/lib/vim/addon_manager.rb vim-addon-manager-0.5.3/lib/vim/addon_manager.rb --- vim-addon-manager-0.5.2/lib/vim/addon_manager.rb 2012-09-30 20:26:39.000000000 +0000 +++ vim-addon-manager-0.5.3/lib/vim/addon_manager.rb 2013-12-03 16:08:34.000000000 +0000 @@ -135,8 +135,11 @@ if override_lines.empty? FileUtils.rm override_file if File.exist? override_file elsif override_lines.hash != checksum + FileUtils.mkdir_p(File.dirname(override_file)) File.open(override_file, 'w') do |file| - file.write override_lines + override_lines.each do |line| + file.write line + end end end end diff -Nru vim-addon-manager-0.5.2/spec/data/registry/foo.yaml vim-addon-manager-0.5.3/spec/data/registry/foo.yaml --- vim-addon-manager-0.5.2/spec/data/registry/foo.yaml 2012-02-01 01:00:49.000000000 +0000 +++ vim-addon-manager-0.5.3/spec/data/registry/foo.yaml 2013-12-03 16:03:08.000000000 +0000 @@ -3,3 +3,4 @@ files: - syntax/foo.vim - ftplugin/foo.vim +disabledby: "let foo_disabled = 1" diff -Nru vim-addon-manager-0.5.2/spec/spec_helper.rb vim-addon-manager-0.5.3/spec/spec_helper.rb --- vim-addon-manager-0.5.2/spec/spec_helper.rb 2012-02-15 12:32:01.000000000 +0000 +++ vim-addon-manager-0.5.3/spec/spec_helper.rb 2013-12-03 17:34:18.000000000 +0000 @@ -53,6 +53,10 @@ @addon_manager ||= Vim::AddonManager.new(target_dir.path) end + def override_file + @override_file ||= Vim::AddonManager.override_file(target_dir.path) + end + end require 'rspec' diff -Nru vim-addon-manager-0.5.2/spec/vim/addon_manager_spec.rb vim-addon-manager-0.5.3/spec/vim/addon_manager_spec.rb --- vim-addon-manager-0.5.2/spec/vim/addon_manager_spec.rb 2012-03-14 01:02:43.000000000 +0000 +++ vim-addon-manager-0.5.3/spec/vim/addon_manager_spec.rb 2013-12-03 17:38:41.000000000 +0000 @@ -30,4 +30,23 @@ target_dir.should have_file('vam/newstylemigrated/syntax/newstylemigrated.vim') end + it 'disables addons' do + addon_list = addons('foo') + addon_manager.install(addon_list) + addon_manager.disable(addon_list) + + output = File.readlines(override_file).map(&:strip) + output.should include(addon_list.first.disabled_by_line) + end + + it 're-enables addons' do + addon_list = addons('foo') + addon_manager.install(addon_list) + addon_manager.disable(addon_list) + File.exists?(override_file).should be_true + + addon_manager.enable(addon_list) + File.exists?(override_file).should be_false + end + end diff -Nru vim-addon-manager-0.5.2/vim-addon-manager.gemspec vim-addon-manager-0.5.3/vim-addon-manager.gemspec --- vim-addon-manager-0.5.2/vim-addon-manager.gemspec 1970-01-01 00:00:00.000000000 +0000 +++ vim-addon-manager-0.5.3/vim-addon-manager.gemspec 2012-10-31 22:08:22.000000000 +0000 @@ -0,0 +1,14 @@ +require './lib/vim/addon_manager/version.rb' + +Gem::Specification.new do |s| + s.name = 'vim-addon-manager' + s.version = Vim::AddonManager::VERSION + s.summary = "Extension manager for the Vim text editor" + s.description = "vim-addon-manager lets you install, remove and upgrade +extension for the Vim text editor. Those extensions can be obtained from system +directories or from the internet." + s.authors = `git log --format=%aN | sort | uniq -c | sort -n -r | sed -e 's/\\s*[0-9]\\+\\s*//'`.lines.map(&:strip) + s.email = 'terceiro@softwarelivre.org' + s.files = Dir.glob('**/*') + s.homepage = 'http://rubygems.org/gems/vim-addon-manager' +end