oreilly-snippets 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d27cdaa420bb60920b3d025fbf2fd1d1801d74
-  data.tar.gz: 3598b75bc1051bca2581724e64cf894c66c6f3bb
+  metadata.gz: 699d24e1d89e9d93b3d5dd37feda9ee4c74dd868
+  data.tar.gz: 9039ca84bd421dc8a8c7d51554dfe4fc715cb53e
 SHA512:
-  metadata.gz: cb4578a7500000a4711f9cd15c6957f781a8d0c809a2bb2f83bedb77723d19b06ced9b9852ad723e186f3bfccf0dbb2c9e952fe190a112ce990ec4eec91fe662
-  data.tar.gz: 0d0adae1b813dbcf5d02efd72ad3202203e498fc577ee8b1120a521155e0adfe1128d10bdb45d3246fb750736d080a6d75ac17c3157b1be684e57a6770366c13
+  metadata.gz: d7d2d7e190256cf14cb906686d6b3f184bece1217d4778730e380cff0f8e2f576b2a23daf86b4728ee1833c295617b6d22e40c0f585830c9e4fa534dd7b2b1e0
+  data.tar.gz: fb09be7dcd0200acfa0f8d76208731c97d1c0d36455390b49d286f9197f36ef4a45a12202439b8f391aadc0c235dcbe1ff5e435061f166cf33f36948e97b7f79

data/lib/oreilly/snippets.rb

@@ -6,12 +6,6 @@ COMMENTS = {
   :python => "#"
 }
 
-class String
-  def unindent
-    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
-  end
-end
-
 module Oreilly
   module Snippets
 
@@ -36,11 +30,10 @@ module Oreilly
           contents = "PLACEHOLDER TEXT, UPDATE WITH CORRECT SHA HASH"
         else
           # Use the filename to change into the directory and use git-show
-          if spec
-            Dir.chdir spec do
-              contents = `git show #{sha}`
-              error = true unless contents
-            end
+          spec = "." unless spec
+          Dir.chdir spec do
+            contents = `git show #{sha}`
+            error = true unless contents
           end
         end
       else
@@ -63,7 +56,7 @@ module Oreilly
       end
 
       if flatten or @@_config[:flatten]
-        rv = rv.unindent()
+        rv = flatten_it( rv )
       end
 
       rv = "INVALID SNIPPET, WARNING" if error
@@ -71,6 +64,27 @@ module Oreilly
       rv
     end
 
+    def self.flatten_it( content ) 
+      # find the smallest indent level, and then strip that off the beginning of all lines
+      smallest = nil
+      lines = content.split "\n"
+      lines.each do |l|
+        if l =~ /^(\s+)/
+          if smallest
+            if $1.length < smallest.length
+              smallest = $1
+            end
+          else
+            smallest = $1
+          end
+        end
+      end
+
+      replaced = content.gsub( /^#{smallest}/, '' )
+      replaced
+    end
+
+
     def self.scrub_other_identifiers( s, comments )
       puts s
       re = /#{comments} BEGIN \S+\n(.*)\n#{comments} END \S+\n/m

data/lib/oreilly/snippets/version.rb

@@ -1,5 +1,5 @@
 module Oreilly
   module Snippets
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oreilly-snippets
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Chris Dawson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler