middleman-hashicorp 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48894cc818c6519f28f263c6c0744fd750ee15e5
-  data.tar.gz: b0bf6f0cf09d42872fa6bc338ae2384e0bc73b70
+  metadata.gz: 7bae9cd8e18d5fc4f58643ce4ecc4307be8bbf57
+  data.tar.gz: ed9bbe1aa3f918154d6b361e9932a1786ba7c615
 SHA512:
-  metadata.gz: 267866fd439dcaba37d96e83ed1144dd62d7bb7352b1603111d9bd73149ec11c9f5c91a1eb185c563e4579927857ba6d24092c3c4628ebc8d0b29a5354eeb08a
-  data.tar.gz: 07fd2273aee1d944d1b8ecd8540fd5b054f09e1400c50da8af3d140cdf3dde215d0f35cf2c20fb2805799ae65e87f2ce21042c293b858748b16f33e9d39a3f7c
+  metadata.gz: 822ca0ee7e0364e76083418432d83a7d2df3b983d80fca13023dacf2c144e49086ede06f92c728bdd6e2f8a487fbc5218f205fc47a9a0f1c2f26b839db0ebb68
+  data.tar.gz: 53880ccae80c71ee051cfca5e588bc8ea512ad536a98166b40f36cf05b658ec800d4a036d5f6d27db2e94306e9c12492350561b2666aa8cca71b94211e1f2b31

data/README.md

@@ -31,7 +31,11 @@ If you are a HashiCorp employee and are deploying a HashiCorp middleman site, yo
 activate :hashicorp do |h|
   h.name        = "packer"
   h.version     = "0.7.0"
-  h.github_slug = "mitchellh/packer"
+  h.github_slug = "hashicorp/terraform"
+
+  # Disable fetching release information - this is useful for non-product site
+  # or local development.
+  h.releases_enabled = false
 
   # Disable some extensions
   h.minify_javascript = false

data/lib/middleman-hashicorp/extension.rb

@@ -1,6 +1,5 @@
 module Middleman
   module HashiCorp
-    require_relative "bintray"
     require_relative "redcarpet"
     require_relative "releases"
     require_relative "rouge"
@@ -8,13 +7,6 @@ module Middleman
 end
 
 class Middleman::HashiCorpExtension < ::Middleman::Extension
-  option :bintray_enabled, false, "Whether Bintray is enabeld"
-  option :bintray_repo, nil, "The Bintray repo name (e.g. mitchellh/packer)"
-  option :bintray_user, nil, "The Bintray http basic auth user (e.g. mitchellh)"
-  option :bintray_key, nil, "The Bintray http basic auth key (e.g. abcd1234)"
-  option :bintray_exclude_proc, nil, "A filter to apply for packages"
-  option :bintray_prefixed, true, "Whether packages are prefixed with the project name"
-
   option :name, nil, "The name of the package (e.g. 'consul')"
   option :version, nil, "The version of the package (e.g. 0.1.0)"
   option :minify_javascript, true, "Whether to minimize JS or not"
@@ -147,7 +139,7 @@ class Middleman::HashiCorpExtension < ::Middleman::Extension
     end
 
     #
-    # Calculate the architecture for the given filename (from Bintray).
+    # Calculate the architecture for the given filename.
     #
     # @return [String]
     #
@@ -199,30 +191,20 @@ class Middleman::HashiCorpExtension < ::Middleman::Extension
   end
 
   #
-  # Query the Bintray API to get the real product download versions.
+  # Query the API to get the real product download versions.
   #
   # @return [Hash]
   #
   def product_versions
-    if !options.bintray_enabled && !options.releases_enabled
-      return {
+    if options.releases_enabled
+      Middleman::HashiCorp::Releases.fetch(options.name, options.version)
+    else
+      {
         "HashiOS" => {
           "amd64" => "/0.1.0_hashios_amd64.zip",
           "i386" => "/0.1.0_hashios_i386.zip",
         }
       }
     end
-
-    if options.bintray_repo
-      Middleman::HashiCorp::BintrayAPI.new(
-        repo:     options.bintray_repo,
-        user:     options.bintray_user,
-        key:      options.bintray_key,
-        filter:   options.bintray_exclude_proc,
-        prefixed: options.bintray_prefixed,
-      ).downloads_for_version(options.version)
-    else
-      Middleman::HashiCorp::Releases.fetch(options.name, options.version)
-    end
   end
 end

data/lib/middleman-hashicorp/redcarpet.rb

@@ -29,7 +29,7 @@ class Middleman::HashiCorp::RedcarpetHTML < ::Middleman::Renderers::MiddlemanRed
   #
   def list_item(text, list_type)
     md = text.match(/(<code>(.+?)<\/code>)/)
-    linked = !text.match(/^(<p>)?<a(.+?)>(.+?)<\/a>\s*?[-:]?/).nil?
+    linked = !text.match(/\A(<p>)?<a(.+?)>(.+?)<\/a>\s*?[-:]?/).nil?
 
     if !md.nil? && !linked
       container, name = md.captures

data/lib/middleman-hashicorp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module HashiCorp
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/spec/unit/helper_spec.rb

@@ -7,7 +7,7 @@ class Middleman::HashiCorpExtension
       app = middleman_app
       @instance = Middleman::HashiCorpExtension.new(
         app,
-        bintray_enabled: false,
+        releases_enabled: false,
         name: "consul",
         version: "0.1.0",
         github_slug: "hashicorp/this_project",
@@ -25,7 +25,7 @@ class Middleman::HashiCorpExtension
         slugless_app,
         name: "consul",
         version: "0.1.0",
-        bintray_enabled: false,
+        releases_enabled: false,
       )
       slugless_instance.app = slugless_app
       expect(slugless_instance.app.github_url).to eq(false)
@@ -37,7 +37,7 @@ class Middleman::HashiCorpExtension
       app = middleman_app
       @instance = Middleman::HashiCorpExtension.new(
         app,
-        bintray_enabled: false,
+        releases_enabled: false,
         name: "consul",
         version: "0.1.0",
         github_slug: "hashicorp/this_project",

data/spec/unit/markdown_spec.rb

@@ -90,6 +90,9 @@ module Middleman::HashiCorp
         - `two` - has a [link_two](#link_two) inside
 
         - `three`: is regular but with a colon
+
+        - `four` - is
+          [on the next](#line)
       EOH
       output = <<-EOH.gsub(/^ {8}/, "")
         <ul>
@@ -99,6 +102,9 @@ module Middleman::HashiCorp
         </li>
         <li><p><a name="three" /><a href="#three"><code>three</code></a>: is regular but with a colon</p>
         </li>
+        <li><p><a name="four" /><a href="#four"><code>four</code></a> - is
+        <a href="#line">on the next</a></p>
+        </li>
         </ul>
       EOH
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-hashicorp
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -177,7 +177,6 @@ files:
 - docker/Dockerfile
 - docker/entrypoint.sh
 - lib/middleman-hashicorp.rb
-- lib/middleman-hashicorp/bintray.rb
 - lib/middleman-hashicorp/extension.rb
 - lib/middleman-hashicorp/redcarpet.rb
 - lib/middleman-hashicorp/releases.rb

data/lib/middleman-hashicorp/bintray.rb

@@ -1,98 +0,0 @@
-require "open-uri"
-
-class Middleman::HashiCorp::BintrayAPI
-  attr_reader :filter
-  attr_reader :prefixed
-
-  #
-  # @param [String] :repo (e.g. mitchellh/packer)
-  # @param [String] :user (e.g. mitchellh/packer)
-  # @param [String] :key (e.g. abcd1234)
-  # @param [Proc] :filter
-  # @param [Boolean] :prefixed
-  #
-  def initialize(repo: nil, user: nil, key: nil, filter: nil, prefixed: true)
-    set_or_raise(:repo, repo)
-    set_or_raise(:user, user)
-    set_or_raise(:key, key)
-
-    @filter = filter || Proc.new {}
-    @prefixed = prefixed
-  end
-
-  #
-  # Get the structured downloads for the given version and required OSes.
-  #
-  # @example
-  #   api.downloads_for_version("1.0.0") #=>
-  #     {
-  #       "os"  => {
-  #         "arch" => "http://download.url",
-  #       }
-  #     }
-  #
-  # @return [Hash]
-  #
-  def downloads_for_version(version)
-    url = "http://dl.bintray.com/#{repo}/"
-    options = { http_basic_authentication: [user, key] }
-
-    if prefixed
-      project = repo.split("/", 2).last
-      regex = /(#{Regexp.escape(project)}_#{Regexp.escape(version)}_.+?)('|")/
-    else
-      regex = /(#{Regexp.escape(version)}_.+?)('|")/
-    end
-
-    result = {}
-
-    open(url, options) do |file|
-      file.readlines.each do |line|
-        if line.chomp! =~ regex
-          filename = $1
-
-          # Hardcoded filter
-          next if filename.include?("SHA256SUMS")
-
-          os = filename.strip.split("_")[-2].strip
-
-          # Custom filter
-          next if filter.call(os, filename)
-
-          arch = line.split("_").last.split(".", 2).first
-
-          result[os] ||= {}
-          result[os][arch] = "https://dl.bintray.com/#{repo}/#{filename}"
-        end
-      end
-    end
-
-    result
-  rescue OpenURI::HTTPError
-    # Ignore HTTP errors and just have no versions
-    return {}
-  end
-
-  private
-
-  #
-  # Magical method that checks if the value is truly present (i.e. not an
-  # empty string), raising an exception if it is not. If the value is present,
-  # the named instance variable and attr_reader are defined.
-  #
-  # @raise [RuntimeError]
-  # @return [true]
-  #
-  def set_or_raise(key, value)
-    value = value.to_s.strip
-
-    if value.empty?
-      raise "Bintray #{key} was not given!"
-    end
-
-    instance_variable_set(:"@#{key}", value)
-    self.class.send(:attr_reader, :"#{key}")
-
-    true
-  end
-end