lib/tasks/bower.rake in bower-rails-0.4.4 vs lib/tasks/bower.rake in bower-rails-0.5.0

@@ -1,111 +1,89 @@
 require 'json'
 require 'pp'
 
 namespace :bower do
-
-  desc "install components from bower"
+  desc "Install components from bower"
   task :install do
-    #install to corresponding directories
-    perform_command do
+    perform do
       sh 'bower install'
     end
   end
 
   namespace :install do
-    desc "install components with -F option"
+    desc "Install components with -F option"
     task :force do
-      perform_command do
+      perform do
         sh 'bower install -F'
       end
     end
   end
 
-  desc "update bower components"
+  desc "Update bower components"
   task :update do
-    #install to corresponding directories
-    perform_command false do
+    perform do
       sh 'bower update'
     end
   end
 
+  desc "List bower components"
+  task :list do
+    perform false do
+      sh 'bower list'
+    end
+  end  
+
   namespace :update do
-    desc "update existing components and uninstalls extraneous components"
+    desc "Update existing components and uninstalls extraneous components"
     task :prune do
-      perform_command false do
+      perform do
         sh 'bower update && bower prune'
       end
     end
   end
+end
 
-  namespace :dsl do
-    desc "install components from bower"
-    task :install do
-      #install to corresponding directories
-      dsl_perform_command do
-        sh 'bower install'
-      end
-    end
+def perform remove_components = true, &block
+  entries = Dir.entries(get_bower_root_path)
 
-    namespace :install do
-      desc "install components with -F option"
-      task :force do
-        dsl_perform_command do
-          sh 'bower install -F'
-        end
-      end
-    end
-
-    desc "update bower components"
-    task :update do
-      #install to corresponding directories
-      dsl_perform_command false do
-        sh 'bower update'
-      end
-    end
-
-    namespace :update do
-      desc "update existing components and uninstalls extraneous components"
-      task :prune do
-        dsl_perform_command false do
-          sh 'bower update && bower prune'
-        end
-      end
-    end
-    
+  if entries.include?('Bowerfile')
+    dsl_perform_command remove_components, &block
+  elsif entries.include?('bower.json')
+    perform_command remove_components, &block
+  else
+    raise LoadError, "No Bowerfile or bower.json file found. Make sure you have it at the root of your project"
   end
-
 end
 
 def get_bower_root_path
   if defined?(Rails)
     return Rails.root
   else
     return Dir.pwd
   end
 end
 
-def dsl_perform_command remove_components = true
-  bower_root = get_bower_root_path
-  BowerRails::Dsl.config = {:root_path => bower_root}
-  dsl = BowerRails::Dsl.evalute(File.join(bower_root, "Jsfile"))
+def dsl_perform_command remove_components = true, &block
+  dsl = BowerRails::Dsl.evalute("Bowerfile")
 
   if remove_components
     dsl.write_bower_json
     dsl.write_dotbowerrc
     puts "bower.js files generated"
   end
 
-  dsl.directories.each do |dir|
-    Dir.chdir(dir) do
-      yield
+  if block_given?
+    dsl.directories.each do |dir|
+      Dir.chdir(dir) do
+        yield
+      end
     end
   end
 end
 
 #run the passed bower block in appropriate folders
-def perform_command remove_components = true
+def perform_command remove_components = true, &block
   bower_root = get_bower_root_path
   #load in bower json file
   txt  = File.read(File.join(bower_root, "bower.json"))
   json = JSON.parse(txt)
 
@@ -131,10 +109,10 @@
       File.open(".bowerrc", "w") do |f|
         f.write(JSON.pretty_generate({:directory => "bower_components"}))
       end
 
       #run command
-      yield
+      yield  if block_given?
 
       #remove bower file
       FileUtils.rm("bower.json")
 
       #remove .bowerrc