necktie 0.3.0 → 0.3.1

data/bin/necktie

@@ -3,4 +3,6 @@ $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__)),
   File.expand_path("../vendor/rake/lib", File.dirname(__FILE__)), File.expand_path("../vendor/rush/lib", File.dirname(__FILE__)),
   File.expand_path("../vendor/session/lib", File.dirname(__FILE__))
 require "necktie"
-necktie ARGV
+
+Rake.application = Necktie::Application.new
+Rake.application.run

data/lib/necktie/rake.rb

@@ -12,28 +12,32 @@ module Necktie
 
     def run
       standard_exception_handling do
-        handle_options
-        Dir.chdir clone_repo do
-          collect_tasks
+        init
+        repo = File.expand_path(".necktie")
+        unless File.exist?(repo)
+          git_url = ENV["GIT_URL"] or fail "Need GIT_URL variable to point to Git repository, can't clone without it"
+          puts "Cloning #{git_url} to #{repo}"
+          sh "git clone #{git_url} #{repo.inspect}"
+          cloned = true
+        end
+        
+        Dir.chdir repo do
           load_rakefile
-          top_level
+          if options.show_tasks
+            display_tasks_and_comments
+          elsif options.show_prereqs
+            display_prerequisites
+          else
+            unless cloned
+              puts "Pulling latest updates to #{repo}"
+              sh "git pull origin #{ENV["BRANCH"] || "master"}"
+            end
+            top_level_tasks.each { |task_name| invoke_task(task_name) }
+          end
         end
       end
     end
 
-    def clone_repo
-      @git_url = ARGV.shift or fail "expecting first argument to be a Git repository URL"
-      repo = File.expand_path(".necktie")
-      if File.exist?(repo)
-        puts "Pulling latest updates to #{repo}"
-        system "cd #{repo.inspect} && git pull origin #{ENV["BRANCH"] || "master"}" or fail
-      else
-        puts "Cloning #{@git_url} to #{repo}"
-        system "git clone #{@git_url} #{repo.inspect}" or fail
-      end
-      repo
-    end
-
     def necktie_options
       [
         ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
@@ -74,7 +78,7 @@ module Necktie
         ],
         ['--version', '-V', "Display the program version.",
           lambda { |value|
-            spec = Gem::Specification.load(File.expand_path("../necktie.gemspec", File.dirname(__FILE__)))
+            spec = Gem::Specification.load(File.expand_path("../../necktie.gemspec", File.dirname(__FILE__)))
             puts "Necktie, version #{spec.version}"
             exit
           }

data/lib/necktie.rb

@@ -3,7 +3,3 @@ require "necktie/files"
 require "necktie/gems"
 require "necktie/services"
 require "necktie/rush"
-
-
-Rake.application = Necktie::Application.new
-Rake.application.run

data/necktie.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "necktie"
-  spec.version        = "0.3.0"
+  spec.version        = "0.3.1"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: necktie
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Assaf Arkin