itamae-plugin-resource-pip 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce7f115766e4005ac824399c3d9825d2864663a7
-  data.tar.gz: ed9a1594bfe82fd27b86ad7ea50a519990d6d976
+SHA256:
+  metadata.gz: 3471fb7176cc80ee5126c134bc64249287c6f484eb51ca5dbb7895413bfe496b
+  data.tar.gz: c925fa949ca3f6deb35f3fb75d19331df3ca77c1b5d9a57bb3a42232f960e5b4
 SHA512:
-  metadata.gz: 968fb21ac7e683a93c99c7204a1db231ba93025510ef73f7f6aafaf1175293946159e2e69107dfc362563582932769cdb855f72ddf927b2aec54da5d3ccf1192
-  data.tar.gz: 92c4685c5815b17a25645aed52dca76f0d8811b1d3266d2c7f065f5b0cd232656be292e7da01ebd5bd34433cbd5fbfccdbbb4513aa35375cbc8bb78293d9d1fe
+  metadata.gz: 3c0275e361233d42e5cb84971035a7827ccd3d920a2d2abe94630479bd14f5755bc3aec02207c3f9f60ece1cdcdcfb6f4b66eca7af2bcff4b3285838398d7252
+  data.tar.gz: 1a5df8e3722cc6db88c26c0f217f05f6a872facb39a6b7379c865516ec8899a5530bb58dcfc37cd0cefcad5aa92920b70a1dab2709ed9c4448857749f94f0577

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.travis.yml

@@ -0,0 +1,12 @@
+sudo: required
+
+language: ruby
+
+services:
+  - docker
+
+before_install:
+  - docker build -t katsyoshi/itamae-plugin-resource-pip .
+
+script:
+  - docker run katsyoshi/itamae-plugin-resource-pip /bin/sh -c "bundle exec rspec"

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby
+
+RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc
+RUN apt-get update
+RUN apt-get install -y python3-pip
+RUN gem install bundler
+ADD . /itamae-plugin-resource-pip
+WORKDIR /itamae-plugin-resource-pip
+RUN bundle install --path .bundle/gems
+RUN bundle exec itamae local ./samples/recipe.rb

data/README.md

@@ -1,4 +1,4 @@
-# Itamae::Plugin::Resource::Pip
+# Itamae::Plugin::Resource::Pip [![Build Status](https://travis-ci.org/katsyoshi/itamae-plugin-resource-pip.svg?branch=master)](https://travis-ci.org/katsyoshi/itamae-plugin-resource-pip)
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/itamae/plugin/resource/pip`. To experiment with that code, run `bin/console` for an interactive prompt.
 
@@ -28,6 +28,7 @@ require 'itamae/plugin/resource/pip'
 pip "tornado" do
   pip_binary "/home/user/.pyenv/shims/pip"
   version "4.1"
+  options '--user'
 end
 ```
 
@@ -46,3 +47,15 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/katyoshi/itamae-plugin-resource-pip. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
+
+### Contributors
+
+[@n0ts](https://github.com/n0ts): [#1](https://github.com/katsyoshi/itamae-plugin-resource-pip/pull/1) delete included version newline code
+
+[@mystelynx](https://github.com/mystelynx): [#2](https://github.com/katsyoshi/itamae-plugin-resource-pip/pull/2) support mitamae
+
+[@ta1kt0me](https://github.com/ta1kt0me): [#3](https://github.com/katsyoshi/itamae-plugin-resource-pip/pull/3) :bug: fixed mitamae
+
+[@citystar](https://github.com/citystar): [#4](https://github.com/katsyoshi/itamae-plugin-resource-pip/pull/4) ignore pip version
+
+[@moritzheiber](https://github.com/moritzheiber): [#5](https://github.com/katsyoshi/itamae-plugin-resource-pip/pull/6) support pip option

data/Rakefile

@@ -1,10 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+RSpec::Core::RakeTask.new("test")
 
-task :default => :test
+task default: :test

data/itamae-plugin-resource-pip.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "itamae-plugin-resource-pip"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["MATSUMOTO, Katsuyoshi"]
   spec.email         = ["github@katsyoshi.org"]
 
@@ -13,14 +13,6 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.homepage      = "https://github.com/katsyoshi/itamae-plugin-resource-pip"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -28,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "itamae", "~> 1.2"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "serverspec"
 end

data/lib/itamae/plugin/resource/pip.rb

@@ -5,8 +5,9 @@ module Itamae
     module Resource
       class Pip < Itamae::Resource::Base
         define_attribute :action, default: :install
-        define_attribute :pip_binary, type: [String, Array], default: 'pip'
+        define_attribute :pip_binary, type: [String, Array], default: ['pip', '--disable-pip-version-check']
         define_attribute :package_name, type: String, default_name: true
+        define_attribute :options, type: [String, Array], default: :auto
         define_attribute :version, type: String, default: false
 
         def pre_action
@@ -66,6 +67,8 @@ module Itamae
 
         def build_pip_install_command
           cmd = [*Array(attributes.pip_binary), 'install']
+          cmd << attributes.options if attributes.options
+
           if attributes.version
             cmd << "#{attributes.package_name}==#{attributes.version}"
           else

data/mrblib/itamae/plugin/resource/pip.rb

@@ -1,10 +1,11 @@
-module MItamae
+module ::MItamae
   module Plugin
     module Resource
-      class Pip < MItamae::Resource::Base
+      class Pip < ::MItamae::Resource::Base
         define_attribute :action, default: :install
         define_attribute :pip_binary, type: [String, Array], default: 'pip'
         define_attribute :package_name, type: String, default_name: true
+        define_attribute :options, type: [String, Array], default: :auto
         define_attribute :version, type: String, default: false
 
         self.available_actions = [:install, :uninstall, :upgrade]

data/mrblib/itamae/plugin/resource_executor/pip.rb

@@ -1,8 +1,8 @@
-module MItamae
+module ::MItamae
   module Plugin
     module ResourceExecutor
-      class Pip < MItamae::ResourceExecutor::Base
-        def apply(current, desired)
+      class Pip < ::MItamae::ResourceExecutor::Base
+        def apply
           if desired.installed
             if current.installed
               if desired.version && current.version != desired.version
@@ -55,6 +55,8 @@ module MItamae
 
         def install!
           cmd = [*Array(attributes.pip_binary), 'install']
+          cmd << attributes.options if attributes.options
+
           if attributes.version
             cmd << "#{attributes.package_name}==#{attributes.version}"
           else
@@ -66,6 +68,8 @@ module MItamae
 
         def uninstall!
           cmd = [*Array(attributes.pip_binary), 'uninstall']
+          cmd << attributes.options if attributes.options
+
           if attributes.version
             cmd << "#{attributes.package_name}==#{attributes.version}"
           else

data/samples/recipe.rb

@@ -0,0 +1,7 @@
+require "itamae/plugin/resource/pip"
+
+pip "tornado" do
+  pip_binary "pip3"
+  version "4.1"
+  options "--prefix=/.pip"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-resource-pip
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - MATSUMOTO, Katsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -28,30 +28,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: serverspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: itamae plugin resource pip
 email:
 - github@katsyoshi.org
@@ -60,7 +74,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
@@ -68,11 +85,11 @@ files:
 - lib/itamae/plugin/resource/pip.rb
 - mrblib/itamae/plugin/resource/pip.rb
 - mrblib/itamae/plugin/resource_executor/pip.rb
+- samples/recipe.rb
 homepage: https://github.com/katsyoshi/itamae-plugin-resource-pip
 licenses:
 - MIT
-metadata:
-  allowed_push_host: https://rubygems.org
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -89,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: itamae plugin resource pip