overapp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWIyODU5Y2M4OWMyZTJkMzFmMDBjNGI3NDZhMmZlZGJhOTVkMDBhYQ==
+    YTE3YjQ3MTdlYmU0OTBiN2YzY2I2NGM0YTViYjQ3Njc2MDc2NjUzMg==
   data.tar.gz: !binary |-
-    NjA3Mjg0ZmFlNGVhMDgxNjc3NDFkMWM0Yjk3MTBiMDAyZDBkYWViYw==
+    M2JkZDVkNmM3ODVmNzIzODc2MGI0YmRlODAwODU1YzFjOWRjNDVmMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzU1NTQ4MTVkMTRiYWM3ZmRlOTU5ZWQ1YjE0NWIyMzA0YjI2ZDk5MjJmMmVm
-    ZTVlYjRkYTcwMTJkOWU0NjQzODg2ZDIxNTA3ZWFkNjBlMGY2ZWFjODg1ZGZm
-    MjBlMDExY2YxYmJjY2MzYWUxMzU1Y2RmNDkyZjljZWEzYTFhYjA=
+    ZTM5NDliOTc3MjBhOGMwZDM5N2RiOTliOTNmZDM0Njg5ZTY3NzJiMmRiYjk4
+    ZGNjZTQ1MGVlMzc1YmE2M2FhYWVkZTUzZWFhYjUyYTgwNzZlYTU3NjUxMWZh
+    MjcyZDNkZDk0MTI5ZDkzNjIxNmU1MTdlYjdiNzhlYWE5MmU0OTA=
   data.tar.gz: !binary |-
-    YjcwMWZiODA2ZmMyZjY4ZTMyZjJiYjlmYjg3ZGQxZGVlMGM1N2UxOTQ5NWIy
-    NmJlNDMwNzNhMzgyYzcwZWIyYTJlZTg1NzU4NzE0ODk0YmRjNjE0YTM4MzNl
-    NmMwMDVlZGY3Y2I1YWYzMzZkNGE1OTA4NTkzNzJkYjYyMTVjZWM=
+    MDA2MDNhNDUwZjkxNTc1YjVkNGVjMmQ0MTllZDYwNWJhNjhlNmQzYTljZjcz
+    ODNkMjkxMzUxYTU3YzY0NzUwOWM4YzlkZjczMWZmNTcyNWEwYWQyMjdkNWU3
+    MTU2YmUwMDNlNDQzNDU0M2ZmYjYzZDU0MDk1NzUxMWNmMWVlNzc=

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/overapp/files.rb

@@ -64,7 +64,7 @@ module Overapp
         raise "bad #{descriptor}" if descriptor.blank?
         if ops[:type] == :command
           load_command(descriptor,ops)
-        elsif descriptor =~ /\.git/
+        elsif descriptor =~ /\.git/ || descriptor =~ /file:\/\//
           load_repo(descriptor)
         else
           load_dir(descriptor,ops)
@@ -79,6 +79,7 @@ module Overapp
       end
 
       def load_repo(url)
+        url = url.gsub "ROOT_DIR", File.expand_path(File.dirname(__FILE__) + "/../..")
         dir = "/tmp/#{rand(1000000000000000000)}"
         ec "git clone #{url} #{dir} 2>&1", :silent => true
         load dir

data/lib/overapp.rb

@@ -32,7 +32,7 @@ module Overapp
     end
 
     def ec(cmd,ops={})
-      `#{cmd}`
+      MharrisExt.ec(cmd,ops)
     end
   end
 end

data/overapp.gemspec

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

data/spec/input/top/.overlay

@@ -1 +1 @@
-c.base "file:///code/orig/fs_template/spec/input/repo/.git"
+c.base "file://ROOT_DIR/spec/input/repo"

data/spec/project_note_spec.rb

@@ -183,18 +183,19 @@ describe "write project" do
     end
   end
 
-  describe "from combined" do
-    before do
-      Overapp::Files.write_combined repo_dir,overapp_dir,output_dir
-    end
-
-    it 'has README' do
-      files_equal repo_dir, output_dir, "README.md"
-    end
-
-    it 'has .abc' do
-      files_equal repo_dir, output_dir, ".abc"
+  if false
+    describe "from combined" do
+      before do
+        Overapp::Files.write_combined repo_dir,overapp_dir,output_dir
+      end
+
+      it 'has README' do
+        files_equal repo_dir, output_dir, "README.md"
+      end
+
+      it 'has .abc' do
+        files_equal repo_dir, output_dir, ".abc"
+      end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext