overapp 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYzNmI4Y2M5OWRmYTE0M2E4OGM5MzZlZWQwODE5NGQ0ZjFkMTg5Zg==
+    YzRiNTg3MTQ3ODAyZjcwMzBlYTQ3NzgzMGIzNTNiZjgxNzFlMmQzMA==
   data.tar.gz: !binary |-
-    NmZiN2JkMmJhNmZhNjc0ZjllZGEzZmJiMDY3OGY3OGQ1OTFiMmMwMA==
+    OTg5MGJkMTAxMWE5YTk5ZWZhMWQxOTk5ZTljMjAzYzU3MzBkYTNlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmMxNDFjZTVmMWM5YjY0MWQzZGQ5NzQ0YjBiZTYwZTE2YTk1ODI5NTI3NmZl
-    NTQ2ZmVlNjczZDI4OGUwMTBjMmI0ZjAzMWMwMTQzZGVjNDU1NzY2ZmFmNWM0
-    Yzg0NDM4NTk1NzIwZGFkZjEwYTQ3M2ViZmEzOWQ1N2UyNzUxMWE=
+    Njg2ZDJkMGY2YjM5ZjNiZDY5YzA2MTE2YzhiYjE4MzI2NmI4MDE2YjQ2M2Uz
+    Mzc3OWEzMTQzMTZmNTAyNWIzNDkzYzkxMGNlNDNkNGVjZTJmNWVjMDMwMDIw
+    OTc1NTZmMmI3YWY3OGRjMjYwMjA2ODMwMDk3Y2UwNzUwOTgwZWI=
   data.tar.gz: !binary |-
-    NTA1YzNjMzc1NTk0Mjc2NDM2MjJmNzBlMjUzMmRlZDA3YzE3ZTg2NzY5NjU4
-    NThhYTQ3NWVlMGRjMWIxZGU0YmVjZGYwOWIxZjM3ZDc4YjVmYzJiNDY0NDZk
-    ZGU4OGVjNDA1YzIxY2I2YzRhNmUyODk5ZDJiZTM5MTUzYTQwNTU=
+    MTIzZTZmMGRmNDFiMWI1NDJkY2E1NzI3ZWQ4OTVhZTkyNmM0OWI5NmJiZWM4
+    ZjQ3MDZjMjMxY2IyM2U4Y2U5ZjNmM2IxNzNkYjE1MmY1MWM0MjgyYWIyNWQ2
+    NTg5Y2QwZTc5OWM4YjUzM2ExMmFmZGNhMTU5NTRjYTVmOWRlMTY=

data/Gemfile

@@ -28,4 +28,5 @@ gem 'mharris_ext',">= 1.7.1"
 
 gem 'andand'
 
-gem 'simplecov', :require => false, :group => :test
+gem 'simplecov', :require => false, :group => :test
+gem 'ptools'

data/Gemfile.lock

@@ -79,6 +79,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    ptools (1.2.2)
     rack (1.5.2)
     rake (10.1.0)
     rb-fsevent (0.9.3)
@@ -116,6 +117,7 @@ DEPENDENCIES
   jeweler (~> 1.8.4)
   lre
   mharris_ext (>= 1.7.1)
+  ptools
   rb-fsevent (~> 0.9)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/overapp/load/types/command.rb

@@ -6,11 +6,11 @@ module Overapp
       def load(base,ops={})
         if relative_output_path.present?
           TmpDir.with do |dir|
-            Overapp.ec "cd #{dir} && #{command}", :silent => true
+            Overapp.ec "cd #{dir} && #{command}", :silent => false
             RawDir.new(:descriptor => "#{dir}/#{relative_output_path}").load(base,ops)
           end
         else
-          Overapp.ec "cd #{ops[:path]} && #{command}", :silent => true
+          Overapp.ec "cd #{ops[:path]} && #{command}", :silent => false
           RawDir.new(:descriptor => ops[:path]).load(base,ops)
         end
       end

data/lib/overapp/project/config.rb

@@ -22,6 +22,7 @@ module Overapp
 
     def load!
       c = self
+      puts body
       eval(body)
     end
   end

data/lib/overapp/project.rb

@@ -30,7 +30,14 @@ module Overapp
     end
 
     def overapp_entries
-      config.overapps + [ConfigEntry.new(:descriptor => path)]
+      res = config.overapps
+      local = config.overapps.find { |x| x.descriptor == "." }
+      if local
+        local.descriptor = path
+        res
+      else
+        res + [ConfigEntry.new(:descriptor => path)]
+      end
     end
 
     def overapps

data/lib/overapp/template_file.rb

@@ -23,6 +23,9 @@ module Overapp
         end
       end
       res
+    rescue => exp
+      puts "Error in split_note_and_body #{path}"
+      raise exp
     end
 
 

data/lib/overapp/util/dir.rb

@@ -2,7 +2,10 @@ module Overapp
   class << self
     def dir_files(dir)
       res = Dir["#{dir}/**/*"] + Dir["#{dir}/**/.*"]
-      res - [".","..",".git"]
+      res = res - [".","..",".git"]
+      rej = res.select { |x| FileTest.file?(x) && File.binary?(x) && !(x =~ /\.txt/) }
+      raise rej.inspect unless rej.empty?
+      res
     end
 
     def with_local_path(overapp_path,&b)

data/lib/overapp/util/git.rb

@@ -9,7 +9,10 @@ module Overapp
           ec "cd #{output_path} && git init && git config user.email johnsmith@fake.com && git config user.name 'John Smith'", :silent => true
         end
 
-        ec "cd #{output_path} && git add . && git commit -m '#{message}'", :silent => true
+        begin
+          ec "cd #{output_path} && git add . && git commit -m '#{message}'", :silent => true
+        rescue; end
+        
         res
       end
       def commit(output_path,message,&b)

data/lib/overapp/util/tmp_dir.rb

@@ -20,6 +20,19 @@ module Overapp
         end
       end
 
+      def local_repo_map
+        res = {}
+        res["https://github.com/mharris717/ember_auth_rails_overlay.git"] = "ember_auth_rails_overlay"
+        res["https://github.com/mharris717/widget_overlay_rails.git"] = "rails_widget"
+        res
+      end
+
+      def to_local_repo_path(url)
+        base = local_repo_map[url]
+        raise "no base #{url}" unless base
+        "/code/orig/ember_npm_projects/overlays/#{base}"
+      end
+
       def with_repo_path(url)
         url = Overapp.to_proper_dir(url)
         with do |dir|
@@ -27,6 +40,14 @@ module Overapp
           yield dir
         end
       end
+
+      def with_repo_path_localuse(url)
+        File.create "/code/orig/overapp/repo.txt",url
+        dir = to_local_repo_path(url)
+        Dir.chdir(dir) do
+          yield dir
+        end
+      end
     end
   end
 end

data/lib/overapp.rb

@@ -1,4 +1,5 @@
 require 'mharris_ext'
+require 'ptools'
 
 class Object
   def klass

data/overapp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "overapp"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
@@ -119,6 +119,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mharris_ext>, [">= 1.7.1"])
       s.add_runtime_dependency(%q<andand>, [">= 0"])
+      s.add_runtime_dependency(%q<ptools>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -131,6 +132,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<mharris_ext>, [">= 1.7.1"])
       s.add_dependency(%q<andand>, [">= 0"])
+      s.add_dependency(%q<ptools>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -144,6 +146,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<mharris_ext>, [">= 1.7.1"])
     s.add_dependency(%q<andand>, [">= 0"])
+    s.add_dependency(%q<ptools>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/project_note_spec.rb

@@ -116,6 +116,29 @@ describe 'Project order' do
   end
 end
 
+describe 'Project order' do
+  let(:config_body) do
+    "c.base :foo
+    c.overapp '.'
+    c.overapp :bar"
+  end
+
+  let(:project) do
+    res = Overapp::Project.new(:path => "/tmp/a/b/c/fun")
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  before do
+    Overapp::Files.stub(:load) { Overapp::Files.new }
+  end
+
+  it "doesn't have self twice" do
+    project.overapp_entries.size.should == 3
+    project.overapp_entries[1].descriptor.should == "/tmp/a/b/c/fun"
+  end
+end
+
 if false
 describe 'Project with no base' do
   let(:config_body) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mike Harris
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement