popo 0.1.4 → 0.1.6

data/bin/envy

@@ -1,16 +1,69 @@
 #!/usr/bin/env ruby
+require 'optparse'
 require 'yaml'
 
-ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-BASH_PATH = `which bash`.strip
-ENV_PATH = `which env`.strip
-POPO_PATH = ENV['popo_path'] if ENV.include?('popo_path')
-POPO_TARGET = ENV['popo_target'] if ENV.include?('popo_target')
-POPO_WORK_PATH = '.manifest'
-ENVYRC = File.expand_path(File.join(File.dirname(__FILE__), '../script/envyrc'))
+module Popo
+  class Envy
+    POPO_CONFIG_FILE = 'popo.yml'
+    ENVYRC_FILE = 'envyrc'
+    BASH_PATH = `which bash`.strip
+    ENVY_CMD = `which env`.strip
+    ENVYRC = File.expand_path("../../script/#{ENVYRC_FILE}", __FILE__)
 
-cmd = ARGV.join(' ')
+    def self.boot(args)
+      options = {}
 
-finale = "#{ENV_PATH} popo_path=#{POPO_PATH} popo_target=#{POPO_TARGET} #{BASH_PATH} -c 'source #{ENVYRC}; cd #{POPO_PATH}; #{cmd}'"
-system(finale)
+      optparse = OptionParser.new do |opts|
+        opts.on('-C', '--chdir DIRECTORY', 'Changed to a given directory') do |d|
+          options[:directory] = d
+        end
+      end
 
+      optparse.parse!
+
+      self.new(args, options)
+    end
+
+    def initialize(args, options)
+      @root_path = args.shift
+      @options = options
+      @commands = []
+
+      # set commands
+      args.each do |a|
+        @commands << a
+      end
+
+      config_file = File.join(@root_path, POPO_CONFIG_FILE)
+
+      if File.exists?(config_file)
+        cfg = YAML.load_file(config_file)
+        @popo_path = cfg['path']
+        @popo_target = cfg['target']
+      else
+        raise "#{config_file} doesn't exist!"
+      end
+
+      if !@options[:directory].nil?
+        @directory = File.join(@popo_path, @options[:directory])
+      else
+        @directory = ''
+      end
+    end
+
+    def run!
+      cmd = "#{ENVY_CMD} popo_path=#{@popo_path} \
+            popo_target=#{@popo_target} #{BASH_PATH} \
+            -c 'source #{ENVYRC}; #{@commands.join(' ')}'"
+
+      if @directory.empty?
+        `#{cmd}`
+      else
+        Dir.chdir(@directory) { `#{cmd}` }
+      end
+    end
+  end
+end
+
+Popo::Envy.boot(ARGV).run!
+exit $?.exitstatus

data/lib/popo/constants.rb

@@ -5,5 +5,6 @@ module Popo
     POPO_WORK_PATH = ".manifest"
     POPO_YML_FILE = "popo.yml"
     POPO_CONFIG = {}
+    POPO_DIRECTORY_KEY = "sync.directories"
   end
 end

data/lib/popo/git_utils.rb

@@ -54,6 +54,32 @@ module Popo
         end
       end
     end
+
+    def self.branch_diff(cwd, branches = ['master', 'development'])
+      if is_git?(cwd)
+        diff_msg = `#{GIT_CMD} log --abbrev-commit --format=short \
+                   origin/#{branches[0]}..origin/#{branches[1]}`
+
+        parsed = diff_msg.scan(/(commit [0-9a-f]+)\n+(.*?)\n+(.*?)(?:\n|$)/)
+
+        puts "Commits in #{branches[0]} not found in #{branches[1]}"
+
+        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}"
+        end
+      else
+        raise "#{cwd} is not a git repo!"
+      end
+
+    end
+
+    def self.is_git?(cwd)
+      File.exists?(File.join(cwd, '.git'))
+    end
   end
 end
 

data/lib/popo/runner.rb

@@ -3,9 +3,10 @@ module Popo
     include Constants
 
     def self.boot(args)
-      Popo::Constants.const_set("BASH_CMD", `which bash`.strip)
-      Popo::Constants.const_set("ENV_CMD", `which env`.strip)
-      Popo::Constants.const_set("GIT_CMD", `which git`.strip)
+      Popo::Constants.const_set("BASH_CMD", `which bash 2>/dev/null`.strip)
+      Popo::Constants.const_set("ZSH_CMD", `which zsh 2>/dev/null`.strip)
+      Popo::Constants.const_set("ENV_CMD", `which env 2>/dev/null`.strip)
+      Popo::Constants.const_set("GIT_CMD", `which git 2>/dev/null`.strip)
 
       self.new(args)
     end
@@ -129,6 +130,10 @@ module Popo
         puts "Pushing!"
       when 'bash'
         bash!
+      when 'zsh'
+        zsh!
+      when 'diff'
+        GitUtils.branch_diff(Dir.pwd)
       else
         puts "I don't know what to do."
       end
@@ -152,6 +157,25 @@ module Popo
       end
     end
 
+    def zsh!
+      if Utils.has_popo_config?(Dir.pwd)
+
+        zdotdir  = File.join(Dir.pwd, POPO_WORK_PATH, 'script')
+        target   = POPO_CONFIG['target']
+        path     = POPO_CONFIG['path']
+        location = POPO_CONFIG['location']
+
+        zshcmd = "%s popo_target=%s popo_path=%s \
+                popo_location=%s ZDOTDIR=%s\
+                %s" \
+                % [ENV_CMD, target, path, location, zdotdir, ZSH_CMD]
+
+                exec(zshcmd)
+      else
+        raise "#{POPO_YML_FILE} not found or it may be wrong!"
+      end
+    end
+
     def get_config!
       if File.exist?(File.join(ENV['HOME'], ".#{DEFAULT_CONFIG_FILE}"))
         config_file_path = File.join(ENV['HOME'], ".#{DEFAULT_CONFIG_FILE}")

data/lib/popo/sync.rb

@@ -12,24 +12,26 @@ module Popo
     end
 
     def gather
-      @repos.each do |repo|
-        if repo =~ /\//
-          r = repo.split('/')
-          @info[:parent], @info[:name] = r
-          @info[:key] = [@info[:parent], @info[:name]].join('.')
-          @info[:path] = File.join(@app_root, @info[:parent], @info[:name])
+      trap("INT") { exit -1 }
 
-          get_repo_values(@info[:key])
+      if !@repos.empty?
+        @repos.each do |repo|
+          if repo =~ /\//
+            r = repo.split('/')
+            @info[:parent], @info[:name] = r
+            @info[:key] = [@info[:parent], @info[:name]].join('.')
+            @info[:path] = File.join(@app_root, @info[:parent], @info[:name])
 
-          clone_or_update
-        else
-          gather_many(repo)
-        end
-      end
+            get_repo_values(@info[:key])
 
-      if @repos.empty?
-        if @cwd.eql? @app_root
-          popo_folders = @db.get("sync.directories").split(',')
+            clone_or_update
+          else
+            gather_many(repo)
+          end
+        end
+      else
+        if @cwd == @app_root
+          popo_folders = @db.get(POPO_DIRECTORY_KEY).split(',')
           popo_folders.each { |p| gather_many(p) }
         else
           repo = File.basename(@cwd)
@@ -41,7 +43,9 @@ module Popo
     def gather_many(repo)
       children = @db.get_children(repo)
 
-      raise "No values for parent key \'#{repo}\'." if children.empty?
+      if children.empty?
+        raise "No values for parent key \'#{repo}\'."
+      end
 
       children.each do |c|
         @info[:key] = [repo, c].join('.')

data/lib/popo/version.rb

@@ -1,3 +1,3 @@
 module Popo
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/script/envyrc

@@ -13,4 +13,4 @@ unset PALMADE_GEMS_DIR
 export PATH="$popo_path/rvm/bin:$popo_path/tools:$PATH"
 export CABLING_PATH=$popo_path/.popo/cabling.yml
 export CABLING_TARGET=$popo_target
-
+export DBGET_PATH=$popo_path/.manifest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &22157620 !ruby/object:Gem::Requirement
+  requirement: &6695400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22157620
+  version_requirements: *6695400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &22157000 !ruby/object:Gem::Requirement
+  requirement: &6694780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22157000
+  version_requirements: *6694780
 - !ruby/object:Gem::Dependency
   name: cableguy
-  requirement: &22156360 !ruby/object:Gem::Requirement
+  requirement: &6692780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22156360
+  version_requirements: *6692780
 description: Ruby and rails repo tool
 email:
 - poymode@gmail.com
@@ -75,7 +75,6 @@ files:
 - lib/templates/envy.yml
 - popo.gemspec
 - script/Rakefile
-- script/envy
 - script/envyrc
 - script/poporc
 - targets/beta.rb

data/script/envy

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-require 'yaml'
-
-ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-BASH_PATH = `which bash`.strip
-ENV_PATH = `which env`.strip
-
-env_config_file = File.join(ROOT_PATH, 'config/envy.yml')
-
-if File.exists? env_config_file
-  env_conf = YAML.load_file(env_config_file)
-  popo_path = env_conf['popo_path']
-  popo_target = env_conf['popo_target']
-  envyrc = "#{ROOT_PATH}/#{env_conf['envyrc_path']}"
-else
-  puts "envyrc file not found. Byebye!"
-  exit
-end
-
-cmd = ARGV.join(' ')
-
-finale = "#{ENV_PATH} popo_path=#{popo_path} popo_target=#{popo_target} #{BASH_PATH} -c 'source #{envyrc}; cd #{popo_path}; #{cmd}'"
-system(finale)
-exit $?.exitstatus