capistrano-nodeenv 0.0.3 → 0.0.5

data/lib/capistrano-nodeenv.rb

@@ -12,9 +12,9 @@ module Capistrano
           _cset(:nodeenv_version, nil)
           _cset(:nodeenv_jobs, 4)
           _cset(:nodeenv_verbose, true)
-          _cset(:nodeenv_verbose, true)
+          _cset(:nodeenv_with_npm, true)
 
-          _cset(:nodeenv_script_url, 'https://raw.github.com/ekalinin/nodeenv/master/nodeenv.py')
+          _cset(:nodeenv_script_url, 'https://raw.github.com/ekalinin/nodeenv/e85a806e21d9bb5e417f1c17080964c485332b27/nodeenv.py')
           _cset(:nodeenv_script_file) {
             File.join(shared_path, 'nodeenv', File.basename(URI.parse(nodeenv_script_url).path))
           }
@@ -38,7 +38,7 @@ module Capistrano
             os << "--jobs=#{nodeenv_jobs} "
             os << "--verbose " if nodeenv_verbose
             os << "--node=#{nodeenv_version} " if nodeenv_version
-            os << "--with-npm" if with_npm
+            #os << "--with-npm" if nodeenv_with_npm
             #os << "--requirement=#{nodeenv_requirements_file}" if nodeenv_requirements_file
             os
           }
@@ -161,14 +161,19 @@ module Capistrano
             unless nodeenv_requirements.empty?
               top.safe_put(nodeenv_requirements.join("\n"), nodeenv_requirements_file, :place => :if_modified)
             end
-            run("touch #{nodeenv_requirements_file} && #{nodeenv_shared_npm_cmd} install #{nodeenv_npm_install_options.join(' ')} #{nodeenv_requirements_file}")
+                cmds = ["touch #{nodeenv_requirements_file}"]
+                cmds << ". #{nodeenv_shared_path}/bin/activate"
+                cmds << "cat #{nodeenv_requirements_file}/package.json | python -c 'import json,sys;obj=json.load(sys.stdin);print \"\\r\\n\".join([k+\"@\"+v for k, v  in obj.get(\"dependencies\", {}).items()])' | awk '{ print \"npm install -g #{nodeenv_npm_install_options.join(' ')} \"$0}' | bash"
+                cmds << "deactivate_node"
+                #run( &&  && #{nodeenv_shared_npm_cmd} install -g #{nodeenv_npm_install_options.join(' ')} #{nodeenv_requirements_file}")
+                invoke_command(cmds.join(' && '))
 
             puts("Updated requirements")
             execute = nodeenv_build_requirements.map { |package, options|
               build_options = ( options || [] )
-              "#{nodeenv_shared_npm_cmd} install #{nodeenv_npm_install_options.join(' ')} #{build_options.join(' ')} #{package.dump}"
+              ". #{nodeenv_shared_path}/bin/activate && #{nodeenv_shared_npm_cmd} install -g #{nodeenv_npm_install_options.join(' ')} #{build_options.join(' ')} #{package.dump} && deactivate_node"
             }
-            run(execute.join(' && ')) unless execute.empty?
+            invoke_command(execute.join(' && ')) unless execute.empty?
           }
 
           task(:create_release, :except => { :no_release => true }) {
@@ -179,7 +184,7 @@ module Capistrano
             # Copy nodeenv from shared to release directory
             cmds << "cp -rf #{nodeenv_shared_path} #{nodeenv_release_path}"
             cmds << "sed -i -e 's|#{nodeenv_shared_path}|#{nodeenv_release_path}|g' #{nodeenv_release_path}/bin/activate"
-            run(cmds.join(' && '))
+            invoke_command(cmds.join(' && '))
           }
         }
       }

data/lib/capistrano-nodeenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Nodeenv
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-nodeenv
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexandr Lispython
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-26 00:00:00 Z
+date: 2013-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano