patternfly-sass 0.0.0.pre.semantically.pre.released → 1.2.0

data/bower.json

@@ -0,0 +1,29 @@
+{
+  "name": "PatternFlySass",
+  "version": "1.0.0",
+  "authors": "Red Hat",
+  "license": "Apache-2.0",
+  "homepage": "https://www.patternfly.org",
+  "main": [
+    "dist/css/patternfly.css"
+  ],
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "app/components",
+    "test",
+    "tests",
+    "package.json",
+    "Gruntfile.js"
+  ],
+  "devDependencies": {
+    "bootstrap-combobox": "~1.1.6",
+    "bootstrap-select": "~1.5.4",
+    "bootstrap-treeview": "~1.0.1",
+    "datatables": "~1.10.4",
+    "datatables-colreorder": "~1.1.2",
+    "datatables-colvis": "~1.1.1",
+    "google-code-prettify": "~1.0.3"
+  }
+}

data/lib/patternfly-sass.rb

@@ -20,7 +20,7 @@ module Patternfly
     end
 
     def stylesheets_path
-      File.join assets_path, 'sass'
+      File.join assets_path, 'stylesheets'
     end
 
     def fonts_path
@@ -28,15 +28,15 @@ module Patternfly
     end
 
     def javascripts_path
-      File.join assets_path, 'js'
+      File.join assets_path, 'javascripts'
     end
 
     def images_path
-      File.join assets_path, 'img'
+      File.join assets_path, 'images'
     end
 
     def assets_path
-      @assets_path ||= File.join gem_path, 'dist'
+      @assets_path ||= File.join gem_path, 'assets'
     end
 
     # Environment detection helpers
@@ -74,9 +74,6 @@ module Patternfly
     end
 
     def register_rails_engine
-      require 'bootstrap-sass'
-      require 'font-awesome-sass'
-
       require 'patternfly-sass/engine'
     end
 
@@ -89,4 +86,4 @@ module Patternfly
   end
 end
 
-Patternfly.load!
+Patternfly.load!

data/lib/patternfly-sass/engine.rb

@@ -1,11 +1,14 @@
+require 'bootstrap-sass'
+require 'font-awesome-sass'
+
 module Patternfly
   module Rails
     class Engine < ::Rails::Engine
       initializer 'patternfly-sass.assets.precompile' do |app|
-        %w(fonts img js sass).each do |sub|
-          app.config.assets.paths << root.join('dist', sub).to_s
+        %w(stylesheets javascripts fonts images).each do |sub|
+          app.config.assets.paths << root.join('assets', sub).to_s
         end
       end
     end
   end
-end
+end

data/lib/patternfly-sass/version.rb

@@ -1,3 +1,4 @@
 module Patternfly
-  VERSION = '0.0.0-semantically-released'
+  VERSION = '1.2.0'
+  PATTERNFLY_SHA = '98ae8fff2c448467bf96166808269b8b25142ed8'
 end

data/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "PatternFlySass",
+  "version": "1.0.0",
+  "author": "Red Hat",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "grunt-contrib-sass": "~0.7.4",
+    "matchdep": "~0.3.0",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-connect": "~0.5.0",
+    "connect-livereload": "~0.3.0",
+    "grunt-contrib-uglify": "~0.3.2",
+    "grunt-contrib-cssmin": "~0.10.0",
+    "grunt-shell": "~1.0.1",
+    "grunt-casper": "~0.4.1",
+    "phantomcss": "~0.7.2",
+    "connect": "~3.2.0",
+    "process": "~0.8.0",
+    "serve-static": "~1.6.1",
+    "serve-index": "~1.2.1",
+    "http": "0.0.0",
+    "fs": "0.0.2",
+    "path": "~0.4.9",
+    "glob": "~4.0.5",
+    "grunt-contrib-clean": "~0.6.0"
+  }
+}

data/patternfly-sass.gemspec

@@ -3,29 +3,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'patternfly-sass/version'
 
 Gem::Specification.new do |s|
-  s.name     = 'patternfly-sass'
+  s.name     = "patternfly-sass"
   s.version  = Patternfly::VERSION
-  s.authors  = ['Dávid Halász', 'Alex Wood']
+  s.authors  = ["Dávid Halász", "Alex Wood"]
   s.email    = 'patternflyui@gmail.com'
   s.summary  = "Red Hat's Patternfly, converted to Sass and ready to drop into Rails"
-  s.homepage = 'https://github.com/Patternfly/patternfly'
-  s.license  = 'Apache-2.0'
+  s.homepage = "https://github.com/Patternfly/patternfly-sass"
+  s.license  = 'MIT'
 
-  s.add_runtime_dependency 'sass', '~> 3.4.15'
-  s.add_runtime_dependency 'bootstrap-sass', '~> 3.3.7'
-  s.add_runtime_dependency 'font-awesome-sass', '~> 4.6.2'
+  s.add_runtime_dependency 'sass', '~> 3.2'
+  s.add_runtime_dependency 'bootstrap-sass', '~> 3.3.4'
+  s.add_runtime_dependency 'font-awesome-sass', '~> 4.3.0'
 
-  s.files = [
-    'patternfly-sass.gemspec',
-    'LICENSE.txt',
-    'README.md',
-    'CODE_OF_CONDUCT.md',
-    'QUICKSTART.md',
-    'OPEN_SOURCE_LICENCES.txt',
-    Dir.glob('lib/**/*'),
-    Dir.glob('dist/sass/**/*'),
-    Dir.glob('dist/js/**/*'),
-    Dir.glob('dist/fonts/**/*'),
-    Dir.glob('dist/img/**/*')
-  ].flatten
+  # Converter's dependencies
+  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'term-ansicolor'
+  # Testing dependencies
+  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'nokogiri', '~> 1.6'
+  s.add_development_dependency 'rmagick', '~> 2.15'
+  s.add_development_dependency 'imgur-api', '~> 0.0.4'
+
+  s.files      = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- tests/*`.split("\n") + `git ls-files -- spec/*`.split("\n")
 end

data/spec/compare_spec.rb

@@ -0,0 +1,43 @@
+require 'net/http'
+require 'nokogiri'
+require 'rmagick'
+
+RSpec.describe "compare SASS with LESS screenshots" do
+  BASEURL = "http://localhost:9000"
+  RESOLUTIONS = [[320, 480], [768, 1024], [1280, 1024]]
+  CONTEXTS = %w(less sass)
+  TOLERANCE = 0.05
+
+  html = Net::HTTP.get(URI("#{BASEURL}/less/patternfly/index.html"))
+  document = Nokogiri::HTML(html)
+
+  document.css(".row a").each do |link|
+    file = link['href']
+    context "#{file}" do
+      title = file.sub('.html', '')
+      RESOLUTIONS.each do |w,h|
+        it "#{w}x#{h}" do
+          CONTEXTS.each do |ctx|
+            `phantomjs tests/capture.js #{w} #{h} #{BASEURL}/#{ctx}/patternfly/#{file} tests/#{ctx}/#{title}-#{w}x#{h}.png`
+          end
+          img_less = Magick::Image.read("tests/less/#{title}-#{w}x#{h}.png").first
+          img_sass = Magick::Image.read("tests/sass/#{title}-#{w}x#{h}.png").first
+
+          cols = [img_less.base_columns, img_sass.base_columns].max
+          rows = [img_less.base_rows, img_sass.base_rows].max
+
+          img_less.resize_to_fill!(cols, rows)
+          img_sass.resize_to_fill!(cols, rows)
+
+          img_diff, diff_rate = img_less.compare_channel img_sass, Magick::MeanAbsoluteErrorMetric, Magick::AllChannels
+          img_less.destroy!
+          img_sass.destroy!
+
+          img_diff.write("tests/failures/#{title}-#{w}x#{h}.png") unless diff_rate <= TOLERANCE
+          img_diff.destroy!
+          expect(diff_rate).to be <= TOLERANCE
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end

data/tasks/converter.rb

@@ -0,0 +1,455 @@
+BOOTSTRAP_GEM_ROOT = Gem::Specification.find_by_name("bootstrap-sass").gem_dir
+require "#{BOOTSTRAP_GEM_ROOT}/tasks/converter"
+require 'pathname'
+
+module Patternfly
+  class Converter < ::Converter
+    BOOTSTRAP_LESS_ROOT = 'components/bootstrap/less'
+    PATTERNFLY_LESS_ROOT = 'less'
+    PATTERNFLY_COMPONENTS = "../components/patternfly/components"
+
+    # Override
+    def initialize(options)
+      defaults = {
+        :branch => 'master',
+        :repo => 'patternfly/patternfly',
+        :cache_path => 'tmp/converter-cache-patternfly',
+        :test_dir => 'tests/patternfly'
+      }
+      options = defaults.merge(options)
+      super(:repo => options[:repo], :cache_path => options[:cache_path], :branch => options[:branch])
+      @save_to = {
+        :scss  => 'assets/stylesheets/patternfly',
+        :js    => 'assets/javascripts/patternfly',
+        :fonts => 'assets/fonts/patternfly'
+      }
+      @test_dir = options[:test_dir]
+      get_trees(PATTERNFLY_LESS_ROOT, BOOTSTRAP_LESS_ROOT, 'components/bootstrap-select', 'components/bootstrap-combobox', 'tests', 'dist')
+    end
+
+    def process_patternfly
+      log_status "Convert Patternfly LESS to SASS"
+      puts " repo : #@repo_url"
+      puts " branch : #@branch_sha #@repo_url/tree/#@branch"
+      puts " save to: #{@save_to.to_json}"
+      puts " twbs cache: #{@cache_path}"
+      puts '-' * 60
+
+      @save_to.values { |v| FileUtils.mkdir_p(v) }
+
+      process_font_assets
+      process_patternfly_less_assets
+      process_javascript_assets
+      store_version
+      cache_tests
+    end
+
+    def remove_xforms(transforms, *rejects)
+      transforms.reject do |xform|
+        rejects.include?(xform)
+      end
+    end
+
+    def process_font_assets
+      log_status 'Processing fonts...'
+      files   = read_files(get_paths_by_type('dist/fonts', /\.(eot|svg|ttf|woff2?)$/))
+      save_to = @save_to[:fonts]
+      files.each do |name, content|
+        save_file File.join(save_to, name.gsub('dist/fonts/', '')), content
+      end
+    end
+
+    def process_javascript_assets
+      log_status 'Processing javascripts...'
+      save_to = @save_to[:js]
+      files   = read_files(get_paths_by_type('dist/js', /\.js$/))
+      files.each do |name, content|
+        save_file File.join(save_to, name.gsub('dist/js/', '')), content
+      end
+    end
+
+    def process_image_assets
+      log_status 'Processing images...'
+      save_to = @save_to[:img]
+      files   = read_files(get_paths_by_type('dist/img', /\.(png|gif|jpg|svg?)$/))
+      files.each do |name, content|
+        save_file File.join(save_to, name.gsub('dist/img/', '')), content
+      end
+    end
+
+    def process_patternfly_less_assets
+      log_status "Processing stylesheets..."
+      files = read_files(bootstrap_less_files)
+      files['less/mixin_overrides.less'] = files['less/mixins.less'].dup
+      save_to = @save_to[:scss]
+
+      files.each do |name, file|
+        # TODO unify the case statements.  Maybe pass in two procs as
+        # callbacks; one for before and one for after.
+        #
+        # TODO override replace_spin so its regex isn't so over-zealous
+        transforms = DEFAULT_TRANSFORMS.dup
+        name = File.basename(name)
+        case name
+        when 'mixin_overrides.less'
+          button_variant = ".button-variant(.*?)"
+          file = replace_rules(file, button_variant) do |rule, pos|
+            ""
+          end
+        when 'patternfly.less'
+          transforms = remove_xforms(transforms, :replace_spin)
+        when 'variables.less'
+          transforms = remove_xforms(transforms, :replace_spin)
+        when 'spinner.less'
+          transforms = remove_xforms(transforms, :replace_spin, :replace_image_urls)
+        end
+
+        file = convert_less(file, *transforms)
+
+        # Special cases go here
+        case name
+        when 'mixins.less'
+          NESTED_MIXINS.each do |selector, prefix|
+            file = flatten_mixins(file, selector, prefix)
+          end
+          file = replace_all(
+            file,
+            /,\s*\.open\s+\.dropdown-toggle& \{(.*?)\}/m,
+            " {\\1}\n  .open & { &.dropdown-toggle {\\1} }")
+        when 'mixin_overrides.less'
+          NESTED_MIXINS.each do |selector, prefix|
+            file = flatten_mixins(file, selector, prefix)
+          end
+        when 'variables.less'
+          file = ['$patternfly-sass-asset-helper: false !default;', file].join("\n")
+          file = replace_all(file, %r{"../img"}, '"../images"')
+          file = replace_all file, %r{(\$font-path): (\s*)"(.*)";}, '\\1: \\2if($patternfly-sass-asset-helper, "patternfly", "\\3/patternfly");'
+          file = replace_all file, %r{(\$img-path): (\s*)"(.*)";}, '\\1: \\2if($patternfly-sass-asset-helper, "patternfly", "\\3/patternfly");'
+          file = replace_all file, %r{(\$icon-font-path): (\s*)"(.*)";\n}, ''
+          file = replace_all file, %r{(\$fa-font-path): (\s*)"(.*)";\n}, ''
+
+        when 'patternfly.less'
+          file = fix_top_level(file)
+          # This is a hack.  We want bootstrap-select to be placed in
+          # the final compiled CSS, but Sass doesn't insert a file's contents
+          # when that file has a '.css' extension.  Sass just uses a @import
+          # statement.  This method moves the bootstrap-select.css into our
+          # output directory and renames it with a '.scss' extension.
+          add_to_dist("bootstrap-select/bootstrap-select.css", "_bootstrap-select-css.scss")
+          # Similar solution for the bootstrap-combobox
+          add_to_dist("bootstrap-combobox/css/bootstrap-combobox.css", "_bootstrap-combobox-css.scss")
+        end
+
+        name_out = "#{File.basename(name, ".less")}.scss"
+        name_out = "_#{name_out}"
+
+        path = File.join(save_to, name_out)
+        save_file(path, file)
+        log_processed(File.basename(path))
+      end
+
+      FileUtils.mv("#{save_to}/_patternfly.scss", File.expand_path("#{save_to}/../_patternfly.scss"))
+    end
+
+    def add_to_dist(name, name_out)
+      in_file = File.join('components', name);
+      in_dir = File.dirname(in_file)
+      dir_files = get_paths_by_directory(in_dir)
+      file = read_files(dir_files)[in_file]
+      raise "add_to_dist failed for #{name}" if file.nil?
+      out_path = File.join(@save_to[:scss], name_out)
+      save_file(out_path, file)
+      log_processed("Moving #{File.join(in_dir, in_file)} to #{out_path}")
+    end
+
+    def convert_less(less, *transforms)
+      load_shared
+      less = convert_to_scss(less, *transforms)
+      less = yield(less) if block_given?
+      less
+    end
+
+    DEFAULT_TRANSFORMS = [
+      :replace_vars,
+      :replace_file_imports,
+      :replace_mixin_definitions,
+      {:replace_mixins => ["mixins"]},
+      :replace_spin,
+      # :replace_fadein,
+      :replace_image_urls,
+      :replace_escaping,
+      :convert_less_ampersand,
+      :deinterpolate_vararg_mixins,
+      :replace_calculation_semantics,
+    ]
+
+    def convert_to_scss(file, *transforms)
+      # TODO The logging noop is to avoid a warning about an unused variable.
+      # We actually are using mixins but we are reading it with an eval.
+      # Possibly worth checking the arity of the method represented by xform
+      # and send in variable in a defined order based on it? But that limits
+      # us to a parameter order that every xform must follow.
+      # Something like
+      # params = [file, mixins]
+      # arity = self.method(xform).arity
+      # send(xform, *params[0..arity])
+      mixins = @shared_mixins + read_mixins(file)
+      silence_log do
+        log_status(mixins)
+      end
+      transforms.each do |xform|
+        args = ["file"]
+        if xform.is_a?(Hash)
+          args.concat(xform.values.first)
+          xform = xform.keys.first
+        end
+        args.map! { |a| "#{eval a}" }
+        file = send(xform, *args)
+      end
+      file
+    end
+
+    def fix_top_level(file)
+      file = replace_all(
+        file,
+        %r{@import\s+"variables";},
+        "")
+      file = replace_all(file, /@import "([^\.]{2})/, '@import "patternfly/\1')
+      file = replace_all(
+        file,
+        %r{../components/font-awesome/less/font-awesome},
+        "font-awesome")
+      file = replace_all(
+        file,
+        %r{../components/bootstrap-select/bootstrap-select.css},
+        "patternfly/bootstrap-select-css")
+      file = replace_all(
+        file,
+        %r{@import\s+"../components/bootstrap/less/bootstrap";},
+        fetch_bootstrap_sass)
+
+      file = replace_all(
+        file,
+        %r{../components/bootstrap-combobox/less/combobox},
+        "patternfly/bootstrap-combobox-css")
+
+      # Variables need to be declared before they are used.
+      variables = <<-VAR.gsub(/^\s*/, '')
+        @import "patternfly/variables";
+        @import "bootstrap/variables";
+        @import "font-awesome/variables";
+      VAR
+      variables + file
+    end
+
+    def fetch_bootstrap_sass
+      bootstrap_sass = IO.read(File.join(BOOTSTRAP_GEM_ROOT, 'assets', 'stylesheets', '_bootstrap.scss'))
+
+      bootstrap_sass = replace_all(
+        bootstrap_sass,
+        %r{@import\s+"bootstrap/variables";},
+        ""
+      )
+
+      mixin_location = end_of(bootstrap_sass, %r{@import\s+"bootstrap/mixins";}).first
+      bootstrap_sass = bootstrap_sass[0..mixin_location] + "@import \"patternfly/mixin_overrides\";\n" + bootstrap_sass[mixin_location..-1]
+      bootstrap_sass
+    end
+
+    def end_of(s, regex)
+      # Returns an array with the end position of each match
+      s.enum_for(:scan, regex).map { Regexp.last_match.end(0) }
+    end
+
+    # Override
+    def replace_file_imports(less, target_path='')
+      less.gsub!(
+        %r([@\$]import\s+(?:\(\w+\)\s+)?["|']([\w\-\./]+).less["|'];),
+        %Q(@import "#{target_path}\\1";)
+      )
+      less.gsub!(
+        %r([@\$]import\s+(?:\(\w+\)\s+)?["|']([\w\-\./]+).(css)["|'];),
+        %Q(@import "#{target_path}\\1.\\2";)
+      )
+      less
+    end
+
+    # Override - bootstrap-sass doesn't handle cases where interpolation occurs outside
+    # double quotes and removes the curly braces too early in the replace process.
+    def replace_escaping(less)
+     # Get rid of ~"" escape
+     less = less.gsub(/~"([^"]+)"/, '#{\1}')
+     # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}")
+     less.gsub!(/\$\{([\w\-]+)\}/, '#{$\1}')
+     # less.gsub!(/(?:"|')([^"'\n]*)(\$\{[\w\-]+\})([^"'\n]*)(?:"|')/, '"\1#{\2}\3"')
+     # Get rid of @{} escape
+     less.gsub!(/\$\{([^}]+)\}/, '$\1')
+     # Get rid of e(%("")) escape
+     less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2')
+    end
+
+    def cache_tests
+      FileUtils.mkdir_p(@test_dir)
+      test_files = get_paths_by_directory('tests')
+      dist_files = get_paths_by_directory('dist/css')
+      test_contents = read_files(test_files)
+      dist_contents = fixup_path(read_files(dist_files))
+      test_contents.merge(dist_contents).each do |file, content|
+        # We go through all this rigmarole so we can save the tests and their
+        # directory structure in a root of our choosing.
+        top = ""
+        # Get the top level directory
+        Pathname.new(file).ascend do |v|
+          top = v
+        end
+        # Get the filename below the top directory
+        save_path = Pathname.new(file).relative_path_from(top).to_s
+
+        # Create the correct destination
+        save_path = File.join(@test_dir, save_path)
+        unless File.directory?(File.dirname(save_path))
+          FileUtils.mkdir_p(File.dirname(save_path))
+        end
+        save_file(save_path, content)
+      end
+      # Load external dependencies for testing
+      `bower install`
+      # This is a workaround for removing the obsoletely installed bootstrap and jquery
+      FileUtils.rm_rf 'tests/components/bootstrap'
+    end
+
+    def fixup_path(hash)
+      Hash[hash.map { |k, v| ["dist/#{k}", v] }]
+    end
+
+    # Override
+    # bootstrap-sass uses this method to read in all Bootstrap's less source files
+    # We're going to repurpose it.
+    def bootstrap_less_files
+      patternfly_less_files
+    end
+
+    def patternfly_less_files
+      get_paths_by_type('less', /\.less$/)
+    end
+
+    def load_shared
+      mixin_hash = {}
+      [BOOTSTRAP_LESS_ROOT, PATTERNFLY_LESS_ROOT].each do |root|
+        mixin_hash[root] = read_files(
+          get_paths_by_type(root, /mixins(\/)|(\.less)/)).values.join("\n")
+      end
+      @shared_mixins ||= begin
+        read_mixins(mixin_hash.values.join("\n"), :nested => NESTED_MIXINS)
+      end
+    end
+
+    def store_version
+      path    = 'lib/patternfly-sass/version.rb'
+      content = File.read(path).sub(/PATTERNFLY_SHA\s*=\s*['"][\w]+['"]/, "PATTERNFLY_SHA = '#@branch_sha'")
+      File.open(path, 'w') { |f| f.write(content) }
+    end
+
+    protected
+
+    # Override
+    def get_trees(*args)
+      root = get_tree(@branch_sha)['sha']
+      @tree_paths = {}
+      args.each do |dir|
+        path_components = dir.split('/')
+        dir_sha = path_components.inject(root) do |tree_sha, component|
+          tree_sha = get_tree_sha(component, get_tree(tree_sha))
+        end
+        hash_list = []
+        descend_tree(get_tree(dir_sha), dir, hash_list)
+        dir_hash = hash_list.inject({}) do |memo, hash|
+          memo.merge(hash)
+        end
+        @tree_paths.merge!(dir_hash)
+      end
+      @trees ||= @tree_paths.values
+    end
+
+    def descend_tree(tree, path, list)
+      list << {path => tree}
+      tree['tree'].map do |f|
+        if f['type'] == 'tree'
+          descend_tree(get_tree(f['sha']), File.join(path, f['path']), list)
+        end
+      end
+    end
+
+    # Override
+    def get_paths_by_type(base_dir, regex)
+      paths = get_paths_by_directory(base_dir)
+
+      # See http://stackoverflow.com/a/2698531 and http://stackoverflow.com/a/2552946
+      matches = Hash.new do |h, key|
+        h[key] = Array.new
+      end
+
+      paths.each do |dir, files|
+        files.each do |f|
+          matches[dir] << f if File.join(dir, f) =~ regex
+        end
+      end
+      matches
+    end
+
+    def get_paths_by_directory(dir)
+      tree = @tree_paths[dir]
+      if tree.nil?
+        log_status("#{dir} not found in Git tree.")
+        return []
+      end
+
+      files = {}
+      files[dir] = []
+      tree['tree'].map do |f|
+        case f['type']
+        when 'blob'
+          files[dir] << f['path']
+        when 'tree'
+          loc = File.join(dir, f['path'])
+          files.merge!(get_paths_by_directory(loc))
+        end
+      end
+      files
+    end
+
+    def get_tree(sha)
+      get_json("https://api.github.com/repos/#@repo/git/trees/#{sha}")
+    end
+
+    def get_tree_sha(dir, tree=get_trees)
+      tree['tree'].find { |t| t['path'] == dir }['sha']
+    end
+
+    # Override
+    def read_files(files)
+      contents = {}
+      files.each do |dir, file|
+        dir_contents = super(dir, file)
+        full_path_contents = Hash[
+          dir_contents.map do |k, v|
+            [File.join(dir, k), v]
+          end
+        ]
+        contents.merge!(full_path_contents)
+      end
+      contents
+    end
+
+    # Override
+    def get_branch_sha
+      @branch_sha ||= begin
+        cmd = "git ls-remote #{Shellwords.escape "https://github.com/#@repo"} #@branch"
+        log cmd
+        result = %x[#{cmd}]
+        raise 'Could not get branch sha!' unless $?.success? && !result.empty?
+        result.split(/\s+/).first
+      end
+    end
+  end
+end