project_group 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWY1YzczN2U2NWQ0NWYwYThjNmNiZjg5NzgyNTZjNmYxZTQ2NTVhNw==
+    NmJkZTI4N2Q5MzIzYmU3MmNlNDMwOWY1MmQzMmU2MjRhNDFkNjE4NQ==
   data.tar.gz: !binary |-
-    YmYwNDg4YmI4OWRmY2Y3ODc3MDI0NGQzMjUxNTZiYzZiYWEyMjBiMw==
+    NDI4NWZjMGQ4NWU4ZDA4OTM4ZTZmNjljZWJkNjZlZjdiYjAyY2Y2Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmUwNmE2MGE0MmM3NmNmOGM2ZjY2YzVmOGM5NWU5YTI3ZDc5NGQ2MDE4NTAx
-    ZWFiMmFkOTE2ZGQ2ODY0OThjZmE1MGM1ZDA5MDZmN2EzMWMxN2VmNTA4Yjc3
-    NmZjYmNmOGFiNDZkNmQ5MGQ0ODViZjBjNDkwY2UyYjkyYzljMjM=
+    NmI2NmVhMjI2ZjBhOTIwZjk2Y2EzYjZhMTY0ZWFmYjZiMmZmNTI0NjgxZmU1
+    ZWNiOGQzZDE3NDhmNGU2NDY1MTRlOTU0YzQ4NmNjMDlkNGZkNTQ3YmFmNzc5
+    ZTQ5OGY4ZmZhOTg0MGRkZDRkMWZmNTAyZWQ3NGJmMmRhMjRlYTI=
   data.tar.gz: !binary |-
-    YjBkYjM0NGY2MGQ4MGRlM2U0YWM2NWUxMjNhNGM5ZTkwYWMyZjA1YzJlZmI1
-    ZTdjMmM5MjZlNTRkN2Q1NTM0NTNlNTBhMTBkNGZhNjY0NGI2ZTI2YmIzNDUx
-    M2ExOWMwNGEwMmViMGE5MTRkY2Q2Mzc2NzJiNmViNWRiYWZjNmE=
+    NjBiYzI2NjE5Y2YzNDcxNGJmODg4ZWRkM2I1NzliNzVhZTA1ZGVlYWZjNjRk
+    MDM4YTc0NjM4YzQ3NDhmZmU1MThjODQwYTIzM2NmZTczOWNlMDJiZTVhMGY3
+    YjE5YzIwOWM1YzhkZjFiNWQ3OTM1ZDFhNTdlNzc4ODg1MDViYmQ=

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/project_group/command.rb

@@ -12,8 +12,10 @@ module ProjectGroup
     fattr(:group) do
       if group_name
         Configs.loaded.groups.find { |x| x.name == group_name }
-      else
+      elsif Configs.loaded.local_group
         Configs.loaded.local_group
+      elsif Configs.loaded.group_for_dir(Dir.getwd)
+        Configs.loaded.group_for_dir(Dir.getwd)
       end.tap { |x| raise "no group #{group_name}" unless x }
     end
 

data/lib/project_group/config.rb

@@ -81,6 +81,18 @@ module ProjectGroup
       local_config.andand.loaded_group
     end
 
+    def group_for_dir(dir)
+      dir = File.expand_path(dir)
+      dir = dir.gsub("/Users/mharris717/Dropbox/CodeLink","/code")
+      groups.find do |group|
+        group.singles.any? do |proj|
+          path = File.expand_path(proj.path)
+          path = path.gsub("/Users/mharris717/Dropbox/CodeLink","/code")
+          File.expand_path(path) == dir
+        end
+      end
+    end
+
     class << self
       fattr(:instance) { new }
       fattr(:loaded) do
@@ -93,6 +105,10 @@ module ProjectGroup
       def group(name,&b)
         instance.group(name,&b)
       end
+
+      def get_group(name)
+        loaded.groups.find { |x| x.name == name }.tap { |x| raise "no group #{name}" unless x }
+      end
     end
   end
 end

data/lib/project_group/repo.rb

@@ -7,9 +7,9 @@ module ProjectGroup
     end
     def cmd(str)
       c = "cd #{path} && #{str}"
-      #puts c
+      puts c
       res = ProjectGroup.ec(c)
-      #puts res
+      puts res
       res
     end
     def git(*args)
@@ -19,6 +19,8 @@ module ProjectGroup
     end
 
     fattr(:repo) do
+      raise "path doesn't exist #{path}" unless FileTest.exist?(path)
+      raise "git path doesn't exist #{path}" unless FileTest.exist?("#{path}/.git")
       Grit::Repo.new(path)
     end
 
@@ -76,7 +78,11 @@ module ProjectGroup
       end
     end
     fattr(:local_ref) do
-      repo.commits("master",1).first.sha.to_s
+      res = repo.commits("master",1).first
+      if !res
+        raise "no local ref for #{path} " + `cd #{path} && ls -al`
+      end
+      res.sha.to_s
     end
     def pushed?
       remote_ref == local_ref

data/lib/project_group/single.rb

@@ -6,7 +6,7 @@ module ProjectGroup
     fattr(:name) do
       File.basename(path)
     end
-    fattr(:repo) do
+    def repo
       Repo.new(:path => path)
     end
     def uncommitted_files

data/project_group.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "project_group"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = "2013-10-02"
+  s.date = "2013-10-07"
   s.description = "project_group"
   s.email = "mharris717@gmail.com"
   s.executables = ["proj"]

data/spec/config_spec.rb

@@ -7,6 +7,7 @@ shared_context "config" do
   let(:local_config_body) { "" }
   let(:config_body) { "" }
   before(:all) do
+    MakeInitial.make
     File.create("#{MakeInitial.tmp_dir}/configs/ezq.rb", config_body)
     File.create("#{MakeInitial.tmp_dir}/tmp1/.project_group.rb", local_config_body) 
 
@@ -104,6 +105,45 @@ describe "ProjectGroup::Config" do
     end
   end
 
+  describe "current dir group" do
+    include_context "config"
+    include_context "project"
+
+    project "foo" do
+      create "a.txt"
+    end
+
+    project "bar" do
+      create "a.txt"
+    end
+
+    let(:config_body) do
+      "ProjectGroup::Configs.group 'ezq' do |g|
+        g.project 'ezq' do |p|
+          p.path '#{MakeInitial.tmp_dir}/projects/foo'
+        end
+      end
+
+      ProjectGroup::Configs.group 'thing' do |g|
+        g.project 'other' do |p|
+          p.path '#{MakeInitial.tmp_dir}/projects/bar'
+        end
+      end"
+    end
+
+    it 'dir' do
+      dir = "#{MakeInitial.tmp_dir}/projects/foo"
+      ProjectGroup::Configs.loaded.group_for_dir(dir).name.should == 'ezq'
+    end
+
+    it 'bar' do
+      dir = "#{MakeInitial.tmp_dir}/projects/bar"
+      ProjectGroup::Configs.loaded.group_for_dir(dir).name.should == 'thing'
+    end
+
+    
+  end
+
   describe "local project file" do
     include_context "config"
     let(:local_config_body) do

data/spec/sublime_project_spec.rb

@@ -14,6 +14,6 @@ describe 'Sublime Project' do
 
   it 'smoke' do
     str = sublime_project.to_json
-    File.create "/code/orig/project_group/ezq.sublime-project",str
+    #File.create "/code/orig/project_group/ezq.sublime-project",str
   end
 end

data/spec/support/make_initial.rb

@@ -17,9 +17,9 @@ class MakeInitial
     Dir.chdir(projects_dir,&b)
   end
   def ec(cmd)
-    #puts cmd
+    puts cmd
     res = `#{cmd} 2>&1`
-    #puts res
+    puts res
     res
   end
   def git(cmd)
@@ -36,6 +36,8 @@ class MakeInitial
     ec "mkdir #{name}"
     Dir.chdir(name) do
       ec "git init"
+      ec "git config user.email johnsmith@fake.com"
+      ec "git config user.name \"John Smith\""
       git "remote add origin file://#{tmp_dir}/origin/#{name}.git"
       yield
     end
@@ -106,6 +108,7 @@ shared_context "project" do
           end
         end
       end
+      sleep(0.1)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_group
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext