berkflow 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6efb7683cb8b8251dfc35923a520ecabc68273
-  data.tar.gz: 20ef5ac9d249a39a5bf1319d3eec4181fcbf72d5
+  metadata.gz: 3e954e4cef8846390031564211f9bba01b4e25ce
+  data.tar.gz: ea5d4db34fb05fb4a712c0cbc94b03b8fd218282
 SHA512:
-  metadata.gz: f34faa9ed17ec3cef061cc435dffe70742e2b6ccb99fef0dd05d2513c62c62fb18d7e646d272c00a60f73c00ae9441f18090c7f02df5d43565680ab56c3945f8
-  data.tar.gz: 6714994388de16ebafb05eda462b72541b40ae0709f0fc60c3854762bc463bec0f6878ca4a542cc27ee7c84dbc63e1584bd01e26178f85f2ac0c176326d00871
+  metadata.gz: a243d317a138e9444a104a68f8835f327a6a6dc3ec14834647d2699c1d0e5bbe58dd64d75fa8471097835090e031d05ff982c6a7a8388fe72d7a94541eac8333
+  data.tar.gz: 94ec93024b61cc6f9a14bba043fe2f7a989de28e0bf18b1e00fc6f0b6d7659b400539da04041eb44ccb4a4eae121d5f79afc4a55c5e78b6d8c0dcdea7e2015d6

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# 0.2.0
+
+* Features
+  * `blo install` command - installs a package generated by `berks package` into your configured Chef Server
+
+* Enhancements
+  * Support `latest` as a version number in upgrade. This will upgrade the environment to the latest version of the given cookbook
+  * Leaving the version blank in upgrade will upgrade the environment to the latest version
+  * Upgrade won't occur if the environment is already at the given version. Override with the `--force` flag
+  * `blo install` aliased to `blo in`
+  * `blo upgrade` aliased to `blo up`
+
+* Bug Fixes
+  * Now possible to install from the generated Gemfile. Previously was using many unreleased gems and dependencies.
+
+# 0.1.0
+
+Initial release
+
+* Features
+  * `blo upgrade` command - upgrade an existing Chef Environment to the given cookbook version

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem "berkshelf", github: "berkshelf/berkshelf"
-gem "ridley", github: "RiotGames/ridley"

data/README.md

@@ -14,7 +14,7 @@ A command line tool for managing Chef Environments using Berkshelf and the [Envi
 
 ### Upgrading a Chef Environment
 
-Berkflow exposes a command for configuring a Chef Environment and running Chef Client on all nodes in that environment.
+Berkflow exposes a command for configuring a Chef Environment to a specific Environment Cookbook version and running Chef Client on all nodes in that environment.
 
     $ blo upgrade myface-dev myface 1.2.3
     Applying cookbook locks to myface-dev...
@@ -23,6 +23,14 @@ Berkflow exposes a command for configuring a Chef Environment and running Chef C
     Successfully ran Chef Client on 10 nodes
     Done. See berkflow_out/20140331172904 for logs.
 
+You can also upgrade to the latest version of the cookbook found on the Chef Server by passing `latest`
+
+    $ blo upgrade myface-dev myface latest
+
+or simply leaving the version blank
+
+    $ blo upgrade myface-dev myface
+
 Your Chef Server must meet the following requirements:
 
   * The `myface-dev` environment must exist
@@ -57,9 +65,24 @@ Shell commands executed with `blo exec` are by default not run with sudo. Use th
 
     $ blo exec myface-dev "ls -lah" --sudo
 
+### Installing Berkshelf packages into a Chef server
+
+Packages generated by `berks package` can be easily installed into a Chef Server with Berkflow.
+
+    $ blo install https://github.com/berkshelf/berkshelf-cookbook/releases/download/v0.3.1/cookbooks.tar.gz
+
+It works with filepaths, too
+
+    $ blo install cookbooks.tar.gz
+
+Installing a package will upload and freeze each cookbook into your configured Chef Server. Already frozen cookbooks
+will be skipped unless you specify the --force flag.
+
+    $ blo install cookbooks.tar.gz --force
+
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/berkflow/fork )
+1. Fork it ( https://github.com/reset/berkflow/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/berkflow.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "solve"
-  spec.add_dependency "berkshelf", "~> 3.0.0.beta7"
-  spec.add_dependency "ridley", "~> 2.5"
-  spec.add_dependency "ridley-connectors", "~> 1.7.0"
+  spec.add_dependency "berkshelf",         "~> 3.0.0.beta8"
+  spec.add_dependency "ridley",            "~> 3.0.0.rc1"
+  spec.add_dependency "ridley-connectors", "~> 2.0.0.rc1"
   spec.add_dependency "thor", "~> 0.18"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/berkflow/cli.rb

@@ -18,6 +18,13 @@ module Berkflow
       end
     end
 
+    LATEST = "latest".freeze
+
+    namespace "berkflow"
+
+    map "up" => :upgrade
+    map "in" => :install
+
     class_option :verbose,
       type: :boolean,
       desc: "Output verbose information",
@@ -44,6 +51,86 @@ module Berkflow
       aliases: "-P",
       default: nil
 
+    method_option :force,
+      type: :boolean,
+      aliases: "-f",
+      desc: "Upload cookbooks even if they are already present and frozen.",
+      default: false
+    desc "install URL", "install Berkshelf package into the Chef Server."
+    def install(url)
+      require 'uri'
+      require 'open-uri'
+      require 'zlib'
+      require 'rubygems/package'
+
+      if is_url?(url)
+        tempfile = Tempfile.new("berkflow")
+        begin
+          open(url) { |remote_file| tempfile.write(remote_file.read) }
+        rescue OpenURI::HTTPError => ex
+          error "Error retrieving remote package: #{ex.message}."
+          exit(1)
+        end
+        url = tempfile.path
+      end
+
+      unless File.exist?(url)
+        error "Package not found: #{url}."
+        exit(1)
+      end
+
+      tmpdir = Dir.mktmpdir("berkflow")
+
+      begin
+        zlib   = Zlib::GzipReader.new(File.open(url, "rb"))
+        io     = StringIO.new(zlib.read)
+        zlib.close
+
+        Gem::Package::TarReader.new io do |tar|
+          tar.each do |tarfile|
+            destination_file = File.join(tmpdir, tarfile.full_name)
+
+            if tarfile.directory?
+              FileUtils.mkdir_p(destination_file)
+            else
+              destination_directory = File.dirname(destination_file)
+              FileUtils.mkdir_p(destination_directory) unless File.directory?(destination_directory)
+              File.open(destination_file, "wb") { |f| f.print tarfile.read }
+            end
+          end
+        end
+      rescue Zlib::GzipFile::Error => ex
+        error "Error extracting package: #{ex.message}"
+        exit(1)
+      end
+
+      cookbooks_dir = File.join(tmpdir, "cookbooks")
+
+      unless File.exist?(cookbooks_dir)
+        error "Package did not contain a 'cookbooks' directory."
+        exit(1)
+      end
+
+      uploaded = Dir.entries(cookbooks_dir).collect do |path|
+        path = File.join(cookbooks_dir, path)
+        next unless File.cookbook?(path)
+        begin
+          cookbook = Ridley::Chef::Cookbook.from_path(path)
+          say "Uploading #{cookbook.cookbook_name} (#{cookbook.version})"
+          ridley.cookbook.upload(path, freeze: true, force: options[:force])
+          true
+        rescue Ridley::Errors::FrozenCookbook
+          true
+        end
+      end.compact
+
+      say "Uploaded #{uploaded.length} cookbooks."
+      say "Done."
+    ensure
+      tempfile.close(true) if tempfile
+      FileUtils.rm_rf(tmpdir) if tmpdir
+    end
+
     method_option :sudo,
       type: :boolean,
       desc: "Execute with sudo",
@@ -102,12 +189,31 @@ module Berkflow
       failures.empty? ? exit(0) : exit(1)
     end
 
-    desc "upgrade ENV APP VERSION", "upgrade an environment to a specific application version."
-    def upgrade(environment, application, version)
+    method_option :force,
+      type: :boolean,
+      aliases: "-f",
+      desc: "Upgrade an environment even if it's already at the given version.",
+      default: false
+    desc "upgrade ENV APP [VERSION]", "upgrade an environment to the specified cookbook version."
+    long_desc <<-EOH
+      Upgrades an environment to the specified cookbook version. If no version is given then the latest
+      version of the cookbook found on the Chef Server will be used.
+    EOH
+    def upgrade(environment, application, version = LATEST)
       version  = sanitize_version(version)
       env      = find_environment!(environment)
       cookbook = find_cookbook!(application, version)
 
+      unless options[:force]
+        if locked = env.cookbook_versions[application]
+          if Solve::Constraint.new(locked).version.to_s == cookbook.version
+            say "Environment already at #{cookbook.version}."
+            say "Done."
+            exit(0)
+          end
+        end
+      end
+
       file = Tempfile.new("berkflow")
       unless contents = cookbook.download_file(:root_file, Berkshelf::Lockfile::DEFAULT_FILENAME, file.path)
         error "#{application} (#{version}) did not contain a Berksfile.lock"
@@ -158,13 +264,26 @@ module Berkflow
       end
 
       def sanitize_version(version)
+        return version if version == LATEST
+
         Solve::Version.new(version).to_s
       rescue Solve::Errors::InvalidVersionFormat
         error "Invalid version: #{version}. Provide a valid SemVer version string. (i.e. 1.2.3)."
         exit(1)
       end
 
+      def is_url?(string)
+        string =~ /^#{URI::regexp}$/
+      end
+
       def find_cookbook!(application, version)
+        if version == LATEST
+          unless version = ridley.cookbook.latest_version(application)
+            error "No versions of Cookbook found: #{application}."
+            exit(1)
+          end
+        end
+
         unless cookbook = ridley.cookbook.find(application, version)
           error "Cookbook not found: #{application} (#{version})."
           exit(1)

data/lib/berkflow/version.rb

@@ -1,3 +1,3 @@
 module Berkflow
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkflow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta7
+        version: 3.0.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta7
+        version: 3.0.0.beta8
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: ridley-connectors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -118,8 +118,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -153,4 +153,3 @@ signing_key:
 specification_version: 4
 summary: A Cookbook-Centric Deployment workflow tool
 test_files: []
-has_rdoc: