serverkit-rbenv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac1ebbe4974fb298789d268f2fb0c8bfd3cdb58
-  data.tar.gz: 0068580d3d8abf4e6b7b3a27fb5319915c7ecc9a
+  metadata.gz: f9e0a154d70b5221a4172560e036b057f0dae64a
+  data.tar.gz: b226ef7916adacdd999cc47aa6df47e797f1e68a
 SHA512:
-  metadata.gz: f2a96c9b4d97eff91bd48f02f1f9dd7a70b6a00e8444abfce435d85d84a7009734e1c049f9d8730e7f9e4b854af8f21bbcadc6ee1cbef78319c5ccd8353d2877
-  data.tar.gz: 500fa14f684f34c76519c11f38c0328a004c03e0e70d465e2408ab97447f6855213c0541bcc0b53021f3542a0804ec8c28e749e8edbfe9f40fb3defa84bf4787
+  metadata.gz: 04480a54aa224aa0e002916eac40de72d88cded7e8242be22b9dda126c7408eb7b5b45ea546813cde4d64893a0bcbdbd2a99f50875d30c7f0bd20d3c3961bd79
+  data.tar.gz: 485394d614b16c75ceb9992233947902314dc6b58b2f2be99f1762eaf8bff9deab3aa0684e4a615e7fcc70c0ccb2d7520e008ed76f66a57f57a13819e98e9038

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+- Provide more easy default values for some attributes
+
 ## 0.2.0
 - Add dependencies attribute for easy installation
 

data/README.md

@@ -19,7 +19,7 @@ Make sure the specified version of Ruby is installed with rbenv.
 #### Attributes
 - version - Installed Ruby version (required) (e.g. `"2.2.0"`)
 - global - Pass true to make it global (default: `false`)
-- rbenv_executable_path - Path to rbenv executable (default: `"rbenv"`)
+- rbenv_executable_path - Path to rbenv executable (default: $HOME/.rbenv/bin/rbenv or rbenv)
 - user - user name (required if dependencies is true)
 - dependencies - Pass true to install rbenv, ruby-build, their dependencies, profile script
 - profile_path - Where to append init script for rbenv (required if dependencies is true)
@@ -30,6 +30,10 @@ resources:
   - type: rbenv_ruby
     version: 2.2.0
     global: true
+    rbenv_executable_path: /home/foo/.rbenv/bin/rbenv
+    user: foo
+    dependencies: true
+    profile_path: /home/foo/.bash_profile
 ```
 
 ### rbenv_dependent_packages
@@ -41,6 +45,20 @@ resources:
   - type: rbenv_dependent_packages
 ```
 
+### rbenv_profile
+Append rbenv init lines into profile file.
+
+#### Attributes
+- profile_path - path to profile file (default: .bash_profile path if user specified)
+- user - user name (required)
+
+#### Example
+```yml
+resources:
+  - type: rbenv_profile
+    user: foo
+```
+
 ### rbenv_rbenv
 Install rbenv into home directory.
 
@@ -54,7 +72,7 @@ resources:
     user: foo
 ```
 
-### rbenv_ruby
+### rbenv_ruby_build
 Install ruby-build into home directory.
 
 #### Attributes

data/lib/serverkit/rbenv/version.rb

@@ -1,5 +1,5 @@
 module Serverkit
   module Rbenv
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/serverkit/resources/rbenv_profile.rb

@@ -3,7 +3,8 @@ require "serverkit/resources/base"
 module Serverkit
   module Resources
     class RbenvProfile < Base
-      attribute :profile_path, required: true, type: String
+      attribute :profile_path, type: String
+      attribute :user, at_least_one_of: [:profile_path], type: String
 
       # @note Override
       def apply
@@ -23,13 +24,18 @@ module Serverkit
           resource = Serverkit::Resources::Line.new(
             @recipe,
             "line" => line,
-            "path" => profile_path,
+            "path" => proper_profile_path,
           )
           resource.backend = backend
           resource
         end
       end
 
+      # @return [String]
+      def get_user_home_directory
+        run_command_from_identifier(:get_user_home_directory, user).stdout.rstrip
+      end
+
       # @return [Array<String>]
       def lines
         [
@@ -37,6 +43,11 @@ module Serverkit
           %<eval "$(rbenv init -)">,
         ]
       end
+
+      # @return [String]
+      def proper_profile_path
+        @proper_profile_path ||= profile_path || "#{get_user_home_directory}/.bash_profile"
+      end
     end
   end
 end

data/lib/serverkit/resources/rbenv_ruby.rb

@@ -9,7 +9,7 @@ module Serverkit
       attribute :dependencies, type: [TrueClass, FalseClass]
       attribute :global, default: DEFAULT_GLOBAL, type: [FalseClass, TrueClass]
       attribute :profile_path, type: String
-      attribute :rbenv_executable_path, default: DEFAULT_RBENV_EXECUTABLE_PATH, type: String
+      attribute :rbenv_executable_path, type: String
       attribute :version, required: true, type: String
 
       # Install the specified version of Ruby with rbenv if rbenv is executable
@@ -51,8 +51,13 @@ module Serverkit
         version
       end
 
+      # @return [String]
+      def get_user_home_directory
+        run_command_from_identifier(:get_user_home_directory, user).stdout.rstrip
+      end
+
       def global_version
-        run_command("#{rbenv_executable_path} global").stdout.rstrip
+        run_command("#{proper_rbenv_executable_path} global").stdout.rstrip
       end
 
       def has_correct_dependencies?
@@ -66,12 +71,12 @@ module Serverkit
 
       # @return [true, false] True if rbenv command is executable
       def has_rbenv?
-        check_command("which #{rbenv_executable_path}")
+        check_command("which #{proper_rbenv_executable_path}")
       end
 
       # @return [true, false] True if the specified version of Ruby is installed
       def has_specified_ruby_version?
-        check_command("#{rbenv_executable_path} prefix #{version}")
+        check_command("#{proper_rbenv_executable_path} prefix #{version}")
       end
 
       def install_dependencies
@@ -79,11 +84,23 @@ module Serverkit
       end
 
       def install_specified_ruby_version
-        run_command("#{rbenv_executable_path} install #{version}")
+        run_command("#{proper_rbenv_executable_path} install #{version}")
+      end
+
+      # @return [String]
+      def proper_rbenv_executable_path
+        case
+        when rbenv_executable_path
+          rbenv_executable_path
+        when user
+          "#{get_user_home_directory}/.rbenv/bin/rbenv"
+        else
+          DEFAULT_RBENV_EXECUTABLE_PATH
+        end
       end
 
       def set_specified_global_version
-        run_command("#{rbenv_executable_path} global #{version}")
+        run_command("#{proper_rbenv_executable_path} global #{version}")
       end
     end
   end

data/serverkit-rbenv.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "serverkit"
+  spec.add_runtime_dependency "serverspec", ">= 0.6.2"
+  spec.add_runtime_dependency "specinfra", ">= 2.31.1"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: serverkit-rbenv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: serverkit
+  name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: specinfra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.31.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.31.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement