bento-ya 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d84b7bb9847875866c918f8fa56fd289dddbfddb
-  data.tar.gz: 848f2e8d01da08ed7b56a95f36fbb32152f0aa99
+  metadata.gz: ff260877c5af06c3daa869b21c3822c10c9744cc
+  data.tar.gz: efa5a7453aefd3b1a45125c86ca14a8331164cbb
 SHA512:
-  metadata.gz: f2d03311ae226ba5cb3fe8fcca6e82d9c49009eb5ec603ad1afdbfaf0865e80ebf758ef4cfcb25481e302c15610cadd54b6f288aae5de44362fb082fe9ad9733
-  data.tar.gz: e71345bd432d9c10df5e4da666b2a526b50b0b5c081e62ca4f3360854930a2f765396b2a6eb92d10fe2720275d27006786d3f8b4bc211c6ba5c4208a1f6c4ad4
+  metadata.gz: 666669fe822e85edf1d0c3254f1b5b9cb8cf983df7b8a591e41b16709772c121951637dcd95a80648a77cac9f8c2812eb0291d7dd606dc289dc707aaeab6a2e4
+  data.tar.gz: 2524156427b8f2312c3e23844d8fae40e94cd3b3e207367b9553c9876772ea4c5ec3a9423e4d69597a56c07b0a86d1a6f23c30f2663aed8f5cc18ccc8cfdf193

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.0.3](https://github.com/cheeseplus/bento-ya/tree/v0.0.3) (2017-02-22)
+[Full Changelog](https://github.com/cheeseplus/bento-ya/compare/v0.0.2...v0.0.3)
+
+**Improvements:**
+
+- Cleaning up code and fixing normalize [\#8](https://github.com/cheeseplus/bento-ya/pull/8) ([cheeseplus](https://github.com/cheeseplus))
+
 ## [v0.0.2](https://github.com/cheeseplus/bento-ya/tree/v0.0.2) (2017-02-18)
 [Full Changelog](https://github.com/cheeseplus/bento-ya/compare/v0.0.1...v0.0.2)
 
@@ -8,7 +15,6 @@
 - Deal with executables missing [\#5](https://github.com/cheeseplus/bento-ya/pull/5) ([karcaw](https://github.com/karcaw))
 
 ## [v0.0.1](https://github.com/cheeseplus/bento-ya/tree/v0.0.1) (2016-12-19)
-**Merged pull requests:**
 
 - Initial release
 

data/README.md

@@ -21,6 +21,8 @@ sure to run `bundle install`.
 
 ### Using `bento`
 
+#### build
+
 To build multiple templates for all providers (VirtualBox, Fusion, Parallels, etc):
 
     $ bento build debian-8.6-amd64 debian-8.6-i386
@@ -29,6 +31,28 @@ To build a box for a single provider:
 
     $ bento build --only=virtualbox-iso debian-8.6-amd64
 
+
+*NOTE*: The following commands rely on the environmental variables
+`ATLAS_TOKEN` and `ATLAS_ORG` being correctly set.
+
+#### upload
+
+To upload built boxes to [Atlas][atlas].
+
+    $ bento upload
+
+#### release
+
+    $ bento release debian-8.6 2.3.3
+
+#### revoke
+
+    $ bento revoke debian-8.6 2.3.3
+
+#### delete
+
+    $ bento revoke debian-8.6 2.3.3
+
 ## Versioning
 
 bento-ya aims to adhere to [Semantic Versioning 2.0.0][semver].
@@ -38,3 +62,5 @@ bento-ya aims to adhere to [Semantic Versioning 2.0.0][semver].
 Apache License, Version 2.0 (see [LICENSE][license])
 
 [license]: https://github.com/cheeseplus/bento-ya/blob/master/LICENSE
+[semver]:  http://semver.org/
+[atlas]:   https://atlas.hashicorp.com

data/lib/bento/common.rb

@@ -107,19 +107,12 @@ module Common
         case tool
         when /parallels/
           ver = cmd.stdout.split(' ')[2]
-          # hash = cmd.stdout.split(' ')[3]
-          # ver = "#{semver} #{hash}"
         when /fusion/
           ver = cmd.stderr.split(' ')[5]
-          # hash = cmd.stderr.split(' ')[6].gsub(/^build-/,'')
-          # ver = "#{semver} \(#{hash}\)"
         when /vagrant/
-          semver = cmd.stdout.split(' ')[1]
-          ver = "#{semver}"
+          ver = cmd.stdout.split(' ')[1]
         when /virtualbox/
           ver = cmd.stdout.split('r')[0]
-          # hash = cmd.stdout.split('r')[1].gsub(/\n/,'')
-          # ver = "#{semver} \(#{hash}\)"
         else
           ver = cmd.stdout.split("\n")[0]
         end
@@ -131,34 +124,3 @@ module Common
     tool_versions
   end
 end
-
-# module PackerExec
-
-#   def for_packer_run_with(template)
-#     Tempfile.open("#{template}-metadata.json") do |md_file|
-#       Tempfile.open("#{template}-metadata-var-file") do |var_file|
-#         write_box_metadata(template, md_file)
-#         yield md_file, var_file
-#       end
-#     end
-#   end
-
-#   def write_box_metadata(template, io)
-#     md = BuildMetadata.new(template, build_timestamp, override_version).read
-#     io.write(JSON.pretty_generate(md))
-#     io.close
-#   end
-
-#   # def write_var_file(template, md_file, io)
-#   #   md = BuildMetadata.new(template, build_timestamp, override_version).read
-
-#   #   io.write(JSON.pretty_generate({
-#   #     box_basename:     md[:box_basename],
-#   #     build_timestamp:  md[:build_timestamp],
-#   #     git_revision:     md[:git_revision],
-#   #     metadata:         md_file.path,
-#   #     version:          md[:version],
-#   #   }))
-#   #   io.close
-#   # end
-# end

data/lib/bento/packerexec.rb

@@ -5,6 +5,7 @@ module PackerExec
     Tempfile.open("#{template}-metadata.json") do |md_file|
       Tempfile.open("#{template}-metadata-var-file") do |var_file|
         write_box_metadata(template, md_file)
+        write_var_file(template, md_file, var_file)
         yield md_file, var_file
       end
     end
@@ -16,16 +17,16 @@ module PackerExec
     io.close
   end
 
-  # def write_var_file(template, md_file, io)
-  #   md = BuildMetadata.new(template, build_timestamp, override_version).read
+  def write_var_file(template, md_file, io)
+    md = BuildMetadata.new(template, build_timestamp, override_version).read
 
-  #   io.write(JSON.pretty_generate({
-  #     box_basename:     md[:box_basename],
-  #     build_timestamp:  md[:build_timestamp],
-  #     git_revision:     md[:git_revision],
-  #     metadata:         md_file.path,
-  #     version:          md[:version],
-  #   }))
-  #   io.close
-  # end
-end
+    io.write(JSON.pretty_generate({
+      box_basename:     md[:box_basename],
+      build_timestamp:  md[:build_timestamp],
+      git_revision:     md[:git_revision],
+      metadata:         md_file.path,
+      version:          md[:version],
+    }))
+    io.close
+  end
+end

data/lib/bento/version.rb

@@ -1,3 +1,3 @@
 module Bento
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bento-ya
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Seth Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake