vimpack 0.0.1 → 0.0.1.1

data/.bundle/config

@@ -0,0 +1,4 @@
+---
+DISSABLE_SHARED_GEMS: '1'
+BUNDLE_PATH: .bundle/bundle
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/.gitignore

@@ -1,6 +1,7 @@
-.bundle
+.bundle/bundle
 *.swp
 tmp/*
 coverage/*
 Gemfile.lock
 cassette_library/*.yml
+pkg/*

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.2-p290

data/features/commands/install.feature

@@ -48,3 +48,14 @@ Feature: Install a vim script
       """
       And the exit status should be 1
 
+  Scenario: Install a script from a github repo directly
+    Given an initialized vimpack in "test_vimpack"
+    When I run `vimpack -e development install https://github.com/tpope/vim-rails.git`
+    Then the output should contain:
+      """
+       * installing vim-rails
+      vim-rails (38b54e3a192197b0d4383e3783ff93e0de2b3d41) installed!
+      """
+      And a directory named "test_vimpack/.vimpack/scripts/github/tpope/vim-rails" should exist and be a git submodule of "test_vimpack/.vimpack"
+      And a symlink named "test_vimpack/.vimpack/vim/bundle/vim-rails" should exist and link to "test_vimpack/.vimpack/scripts/github/tpope/vim-rails"
+      And the exit status should be 0

data/lib/vimpack/models/script.rb

@@ -13,9 +13,11 @@ module Vimpack
       attr_reader :name, :type, :version, :version_date, :author, :author_email
       # From Github
       attr_reader :url, :description
+      # From awesomeness
+      attr_reader :repo_owner
 
       SCRIPT_TYPES = [ 'utility', 'color scheme', 'syntax', 'ftplugin',
-                       'indent', 'game', 'plugin', 'patch' ]
+                       'indent', 'game', 'plugin', 'patch', 'github' ]
 
       def initialize(attrs={})
         set_attributes_from_input(attrs)
@@ -29,8 +31,8 @@ module Vimpack
       end
 
       def set_attributes_from_github
-        url = "vim-scripts/#{name}"
-        @repo = self.class.repo("vim-scripts/#{name}")
+        url = "#{repo_owner}/#{name}"
+        @repo = self.class.repo(url)
         [ :url, :description ].each { |attr| instance_variable_set("@#{attr}".to_sym, @repo[attr]) }
         set_version_from_github
       end
@@ -43,7 +45,11 @@ module Vimpack
 
       def set_version_from_github
         last_commit = commits.last
-        @version = last_commit.message[0..10].gsub(/Version /, '')
+        if type == 'github'
+          @version = last_commit.id
+        else
+          @version = last_commit.message[0..10].gsub(/Version /, '')
+        end
         @version_date = last_commit.authored_date
       end
 
@@ -54,9 +60,23 @@ module Vimpack
       end
 
       def self.get(name)
-        vimscript = get_vimscript(name)
-        raise ScriptNotFound.new(name) if vimscript.nil?
-        Script.new(vimscript)
+        # If the name has a slash in it, then it's URLy and it's a straight github repo
+        _type = (name =~ /\//) ? :github : :vimscript
+        case _type
+        when :github
+          repo_key = name.split("/")[-2..-1].join("/").split(".").first # wut demeter?
+          repo = repository(repo_key)
+          script_hash = 
+            { :name => repo.name, :type => 'github',
+              :description => repo.description, :script_version => '',
+              :author => repo.owner, :author_email => '',
+              :repo_owner => repo.owner
+            }
+        when :vimscript
+          script_hash = get_vimscript(name)
+          raise ScriptNotFound.new(name) if script_hash.nil?
+        end
+        Script.new(script_hash)
       end
 
       def self.info(name)
@@ -66,7 +86,12 @@ module Vimpack
       def install!(link_to_bundle=true)
         Repo.raise_unless_initialized!
         raise AlreadyInstalled.new(name) if installed?
-        Repo.add_submodule(url, type.gsub(' ', '_'), name)
+        case type
+        when 'github'
+          Repo.add_submodule(url, type.gsub(' ', '_'), repo_owner, name)
+        else
+          Repo.add_submodule(url, type.gsub(' ', '_'), name)
+        end
         if link_to_bundle
           Repo.create_link(install_path, bundle_path)
         end
@@ -90,7 +115,12 @@ module Vimpack
       end
 
       def install_path
-        Repo.script_path.join(type.gsub(' ', '_'), name)
+        case type
+        when 'github'
+          Repo.script_path.join(type.gsub(' ', '_'), repo_owner, name)
+        else
+          Repo.script_path.join(type.gsub(' ', '_'), name)
+        end
       end
 
       def bundle_path

data/lib/vimpack/utils/process.rb

@@ -20,7 +20,7 @@ module Vimpack
         Results.new(child)
       end
 
-      def wait_for_child(child, timeout=30)
+      def wait_for_child(child, timeout=240)
         child.process.poll_for_exit(timeout.to_f)
         child.process.stop unless child.process.exited?
         child.process.io.stdout.close

data/lib/vimpack/utils/vimscripts.rb

@@ -54,7 +54,8 @@ module Vimpack
         def normalize_vimscript(script)
           { :name => script['n'], :type => script['t'],
             :description => script['s'], :script_version => script['rv'],
-            :author => script['ra'], :author_email => script['re']
+            :author => script['ra'], :author_email => script['re'],
+            :repo_owner => 'vim-scripts'
           }
         end
 

data/lib/vimpack/version.rb

@@ -1,4 +1,4 @@
 module Vimpack
   # FIXME: shouldn't have to have this unless statement
-  VERSION = "0.0.1" unless const_defined?('VERSION')
+  VERSION = "0.0.1.1" unless const_defined?('VERSION')
 end

metadata

@@ -1,228 +1,226 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vimpack
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.1.1
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Bram Swenson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-20 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17939000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.13
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17939000
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &17937320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rainbow
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *17937320
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: &17933900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: childprocess
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *17933900
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: &17932080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *17932080
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &17930820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *17930820
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &17929780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: enviro
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *17929780
+- !ruby/object:Gem::Dependency
+  name: enviro
+  requirement: &17928920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *17928920
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &17927920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: octokit
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *17927920
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: &17927060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *17927060
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &17926500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *17926500
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &17923380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *17923380
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &17922100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *17922100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &17921460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *17921460
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &17920380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: autotest-standalone
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *17920380
+- !ruby/object:Gem::Dependency
+  name: autotest-standalone
+  requirement: &17919100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *17919100
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: &17917620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *17917620
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &17916680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *17916680
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &17912620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id018
-description: " Vim Script Package Manager based on pathogen.vim by Tim Pope "
-email: 
+  prerelease: false
+  version_requirements: *17912620
+description: ! ' Vim Script Package Manager based on pathogen.vim by Tim Pope '
+email:
 - bram@craniumisajar.com
-executables: 
+executables:
 - vimpack
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
+- .bundle/config
 - .gitignore
+- .rbenv-version
 - .rspec
 - .rvmrc
 - Gemfile
@@ -282,52 +280,34 @@ files:
 - tasks/rspec.rake
 - templates/vimrc.erb
 - vimpack.gemspec
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2910229080418397065
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2910229080418397065
 requirements: []
-
 rubyforge_project: vimpack
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Vim Script Package Manager
-test_files: 
-- features/commands/environments.feature
-- features/commands/git.feature
-- features/commands/info.feature
-- features/commands/init.feature
-- features/commands/install.feature
-- features/commands/list.feature
-- features/commands/search.feature
-- features/commands/uninstall.feature
-- features/step_definitions/environment_steps.rb
-- features/step_definitions/file_utils_steps.rb
-- features/step_definitions/initialize_steps.rb
-- features/step_definitions/output_steps.rb
-- features/step_definitions/vimpack_git_steps.rb
-- features/support/env.rb
-- features/support/executable_paths.rb
-- spec/spec_helper.rb
-- spec/vimpack/models/repo_spec.rb
-- spec/vimpack/models/script_spec.rb
-- spec/vimpack/utils/github_spec.rb
-- spec/vimpack/utils/vimscripts_spec.rb
+test_files: []