popo 0.1.8 → 0.1.9

data/lib/popo.rb

@@ -15,7 +15,6 @@ module Popo
   autoload :Initializer, File.join(POPO_LIB_ROOT, 'initializer')
   autoload :Runner, File.join(POPO_LIB_ROOT, 'runner')
   autoload :RVM, File.join(POPO_LIB_ROOT, 'rvm')
-  autoload :Service, File.join(POPO_LIB_ROOT, 'service')
   autoload :Sync, File.join(POPO_LIB_ROOT, 'sync')
   autoload :Utils, File.join(POPO_LIB_ROOT, 'utils')
 end

data/lib/popo/git_utils.rb

@@ -62,17 +62,23 @@ module Popo
 
         parsed = diff_msg.scan(/(commit [0-9a-f]+)\n+(.*?)\n+(.*?)(?:\n|$)/)
 
-        puts "Commits in #{branches[0]} not found in #{branches[1]}"
+        Utils.say "#{File.basename(cwd).capitalize}"
 
         parsed.each do |p|
           commit_id = p[0].gsub(/commit/,'').strip
           author = p[1].scan(/Author: (.*) <.*>/)
           commit_msg = p[2].strip
 
-          Utils.say "#{commit_id} \<#{author}\> #{commit_msg}"
+          Utils.say "#{commit_id} \<#{author}\> #{commit_msg}", true
         end
       else
-        Error.say "#{cwd} is not a git repo!"
+        repos = Dir.entries(cwd) - [ '.', '..' ]
+
+        repos.each do |r|
+          if File.directory?(r)
+            FileUtils.cd(r) { branch_diff(File.join(cwd, r)) }
+          end
+        end
       end
 
     end

data/lib/popo/runner.rb

@@ -65,16 +65,17 @@ module Popo
       if args.length < 1
         Utils.say optparse.help
       else
+        @db_opts[:path]     = File.join(@app_root, POPO_WORK_PATH)
+        @db_opts[:target]   = ENV['CABLING_TARGET'] || @options[:target] || DEFAULT_POPO_TARGET
+        @db_opts[:location] = ENV['CABLING_LOCATION'] || @options[:location]
+        @db_opts[:verbose]  = @options[:verbose]
+
         # set manifest usable constants
         Object.const_set("POPO_PATH", @app_root)
-        Object.const_set("POPO_TARGET", DEFAULT_POPO_TARGET)
+        Object.const_set("POPO_TARGET", @db_opts[:target])
         Object.const_set("POPO_LOCATION", @options[:location])
         Object.const_set("POPO_USER", @options[:user])
 
-        @db_opts[:path]     = File.join(@app_root, POPO_WORK_PATH)
-        @db_opts[:target]   = ENV['CABLING_TARGET'] || @options[:target] || DEFAULT_POPO_TARGET
-        @db_opts[:location] = ENV['CABLING_LOCATION'] || @options[:location]
-        @db_opts[:verbose]  = @options[:verbose]
 
         mandatory = [:path, :manifest]
         mandatory = mandatory.select { |p| @options[p].nil? }
@@ -132,11 +133,6 @@ module Popo
         sh!(cmd)
       when 'diff'
         GitUtils.branch_diff(Dir.pwd)
-      when 'stop' || 'start' || 'restart'
-        db = Database.new(@app_root, @db_opts)
-        db.boot_database
-
-        Service.new(@app_root, cmd, db).run
       else
         Error.say "#{args} not a valid command!"
       end

data/lib/popo/sync.rb

@@ -64,7 +64,7 @@ module Popo
 
     def get_project
       if !File.exists?(@info['path'])
-        GitUtils.git_clone(@info[''], @info['path'], @info['branch'])
+        GitUtils.git_clone(@info['repo'], @info['path'], @info['branch'])
       else
         if POPO_CONFIG['target'] == DEFAULT_POPO_TARGET
           GitUtils.git_stash(@info['path'])

data/lib/popo/version.rb

@@ -1,3 +1,3 @@
 module Popo
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &23544220 !ruby/object:Gem::Requirement
+  requirement: &20227340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23544220
+  version_requirements: *20227340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &23543520 !ruby/object:Gem::Requirement
+  requirement: &20226280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23543520
+  version_requirements: *20226280
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &23542420 !ruby/object:Gem::Requirement
+  requirement: &20225240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23542420
+  version_requirements: *20225240
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com