chefenv 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 0.2.0
+
+*Replaces shell outs with ruby code
+*Allows setting your environments directory with CHEFENV_DIR
+*Defaults environments directory to ~/.chefenv instead of ~/chef
+
+# 0.1.0
+
+*Basic functionality
+*Allows switching between manually created environments

data/README.md

@@ -2,6 +2,7 @@
 
 Manages multiple chef server/organization environments
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -18,30 +19,33 @@ Or install it yourself as:
 
 ## Usage
 
+Environments are stored under CHEFENV_DIR/environments.
+You can set the CHEFENV_DIR environment variable if you like. The default value is ~/.chefenv
+
+Upgrade Note: This is different from version 0.1.0 - You should move your environment folders from
+~/chef to ~/.chefenv/environments
+
 Execute:
 
+WARNING: If you have data stored under ~/.chef the init command will DELETE it!
+
     $ chefenv init
 
-This will ensure that you have a ~/chef directory.
+This will setup CHEFENV_DIR/environments and clear the current environment.
 
-Create a directory under ~/chef for each of your environments.
+Create a directory under CHEFENV_DIR/environments for each of your environments.
 Put your knife.rb, .pem and any other files you need for that organization
 under that folder. For example, for my hosted chef organization, I create
 ~/chef/hosted and put my knife.rb and .pem files in there. Additionally, this is
 a reasonable place to put secret key files.
 
-Once you have at least one folder created under ~/chef, you can
+Once you have at least one environment folder you can
 
     $ chefenv list
-
-or
-
     $ chefenv use ENVNAME
 
 ## Future Work
 
-1. Allow using a different directory than ~/chef
-1. Read the ~/.chef symlink to get the current env instead of using ~/chef/current file
 1. Add tasks for creating/destroying organizations
 
 ## Contributing

data/lib/chefenv.rb

@@ -4,30 +4,27 @@ require "chefenv/version"
 require 'pathname'
 
 module ChefEnv
-  # Your code goes here...
   class Tasks < Thor
 
     desc "list", "list the available chef environments"
     def list
       current = current_environment
       available_environments.each do |env|
-        puts "#{(env == current_environment) ? '*' : ' '} #{env}"
+        puts "#{(env == current) ? '*' : ' '} #{env}"
       end
-      if available_environments.size == 0
+      if available_environments.empty?
         puts "No Environments Available"
       end
     end
 
     desc "use ENV", "use a particular environment"
     def use(env="")
-      unless env == current_environment
-        if available_environments.include?(env)
-          select_environment(env)
-        else
-          puts "#{env} is not a known environment"
-          list
-        end
+      if available_environments.include?(env)
+        select_environment(env)
+      else
+        puts "'#{env}' is not a known environment."
       end
+      list
     end
 
     desc "current", "display the name of the current environment"
@@ -37,47 +34,51 @@ module ChefEnv
 
     desc "init", "initialize the environment"
     def init()
-      FileUtils.mkdir_p(File.expand_path("~/chef")) unless File.exists?("~/chef")
-      current = current_environment
+      FileUtils.mkdir_p(chefenv_dir) unless File.directory?(chefenv_dir)
+      FileUtils.mkdir_p(environments_dir) unless File.directory?(environments_dir)
+      FileUtils.safe_unlink(chef_dir)
+      list
+    end
 
-      if current.nil?
-        puts 'No environment selected. Picking the first one that I find. You can change it with `chefenv use ENV`'
-        available = available_environments
-        if available.empty?
-          puts "No environments are available"
-        else
-          puts "Trying to use '#{available.first}'"
-          use(available.first)
-        end
-        current = current_environment
-        list
-        return
+    no_tasks do
+
+      def chef_dir
+        File.expand_path("~/.chef")
       end
 
-      unless available_environments.include?(current)
-        puts "'#{current}' is selected as the current environment, but it is not valid. Please select a different environment"
-        `rm -f ~/.chef`
-        `rm -f ~/chef/current`
-        list
-        return
+      def chefenv_dir
+        dir = ENV['CHEFENV_DIR'].to_s 
+        dir = File.expand_path("~/.chefenv") if dir.empty?
+        dir
       end
 
-    end
+      def environments_dir
+        File.expand_path('environments', chefenv_dir)
+      end
+
+      def environment_dir(environment)
+        File.expand_path(environment, environments_dir)
+      end
 
-    no_tasks do
       def available_environments
-        Pathname.new(File.expand_path("~/chef")).children.select { |c| c.directory? }.map { |d| d.basename.to_s }
+        Pathname.new(environments_dir).children.select { |c| c.directory? }.map { |d| d.basename.to_s }
+      end
+
+      def environment_available?(env)
+        available_environments.include?(env)
       end
 
       def select_environment(env)
-        File.write(File.expand_path("~/chef/current"), env)
-        `rm -f ~/.chef`
-        `ln -s ~/chef/#{env} ~/.chef`
+        unless current_environment == env
+          File.write(File.expand_path("#{chefenv_dir}/current"), env)
+          FileUtils.safe_unlink(chef_dir)
+          FileUtils.symlink(File.join(environments_dir, env), chef_dir)
+        end
       end
 
       def current_environment
         begin
-          File.read(File.expand_path("~/chef/current")).chomp
+          Pathname.new(File.readlink(File.expand_path('~/.chef'))).split.last.to_s
         rescue Errno::ENOENT
           nil  
         end

data/lib/chefenv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefenv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md