clenver 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6615635905444802e77cd25ff92232495181812
-  data.tar.gz: 7fbcb7463f62b4d328bf6cd80d1aa0255c4c8b2c
+  metadata.gz: 5e85aeffdfd4c41bcd5e0619efd95f1a01376b88
+  data.tar.gz: b653a128a39b2df1fe746bfb0cfc9264f824edf1
 SHA512:
-  metadata.gz: 17a40c5c82382d3b441cd27e065991113f1b7bad77495c94a307cf15c2173e608428fd70ac8ffcd37e719fdffc3ac9ea46c525fd154a2f566d5bf1bd0326f464
-  data.tar.gz: 4d70749859828c34c68f1fd7e9e26e77b1a142c8a07344e70b1835e9f27bfd9e89065e655ff86a2d1e76893cf2f4665eae8b3745ebedbbb9215167bb43349a94
+  metadata.gz: e17ec53f716c370021a4dedef70d670d52bb4584827e0c94ea140747ca85acd1c77751d6bc6860ef9f54fcb2f82a62454138fa074b7401bb95ada298f6d74abe
+  data.tar.gz: bbb1da9489a957ba1d706a04cb5d622cd0c73a3ebb51e48195bf893897b19bf2b50d233a533e7bbec753aa5f057fe49a001e3a8106294a3ec393dff421da6b2e

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    clenver (0.1.12)
+    clenver (0.1.13)
       git (= 1.2.6)
       gli (= 2.8.0)
+      thor (= 0.18.1)
 
 GEM
   remote: https://rubygems.org/

data/bin/clenver

@@ -1,68 +1,3 @@
 #!/usr/bin/env ruby
-require 'gli'
-begin # XXX: Remove this begin/rescue before distributing your app
-  require 'clenver'
-  require 'clenver/runner'
-  require 'clenver/logging'
-rescue LoadError
-  STDERR.puts "In development, you need to use `bundle exec bin/clenver` to run your app"
-  STDERR.puts "At install-time, RubyGems will make sure lib, etc. are in the load path"
-  STDERR.puts "Feel free to remove this message from bin/clenver now"
-  exit 64
-end
-
-include GLI::App
-
-program_desc 'Command Line home ENVironment managER'
-
-version Clenver::VERSION
-
-desc 'Initialize workspace environment based on given configuration'
-arg_name 'Describe arguments to init here'
-command :init do |c|
-  # c.desc 'Describe a switch to init'
-  # c.switch :s
-
-  # c.desc 'Describe a flag to init'
-  # c.default_value 'default'
-  # c.flag :f
-  c.action do |global_options,options,args|
-
-    # Your command logic here
-
-    unless args.empty?
-      include Logging
-      logger.debug("args: #{args}")
-      path = args[0]
-      dst_dist = args[1]
-      Clenver::Runner.new(path, dst_dist).start
-    else
-      exit_now!("pass config file as a clenver init argument", 2)
-    end
-    # If you have any errors, just raise them
-    # raise "that command made no sense"
-  end
-end
-
-pre do |global,command,options,args|
-  # Pre logic here
-  # Return true to proceed; false to abort and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
-  true
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
-end
-
-exit run(ARGV)
+require 'clenver/cli'
+Clenver::CLI.start

data/clenver.gemspec

@@ -25,5 +25,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('aruba')
   s.add_development_dependency('rspec-expectations')
   s.add_runtime_dependency('gli','2.8.0')
+  s.add_runtime_dependency('thor','0.18.1')
   s.add_runtime_dependency('git','1.2.6')
 end

data/features/clenver_init.feature

@@ -147,6 +147,7 @@ Feature: Initialization
     When I run `clenver init test_repo.yml some_tmp`
     Then the output should contain "success!!!!\n"
 
+  @ignore
   Scenario: apt: check if package installed
     Given The default aruba timeout is 10 seconds
     Given a file named "test_repo.yml" with:
@@ -157,6 +158,7 @@ Feature: Initialization
     When I run `clenver init test_repo.yml some_tmp`
     Then the output should contain "vim is already the newest version.\n"
 
+  @ignore
   Scenario: package installed and simple command run
     Given The default aruba timeout is 10 seconds
     Given a file named "test_repo.yml" with:
@@ -172,7 +174,7 @@ Feature: Initialization
     Then the output should contain "success!!!!\n"
 
   Scenario: install gem
-    Given The default aruba timeout is 45 seconds
+    Given The default aruba timeout is 120 seconds
     Given a file named "test_repo.yml" with:
     """
     gem:
@@ -185,7 +187,7 @@ Feature: Initialization
     Then the output should contain "installed\n"
     Then the output should contain "success!!!!\n"
 
-  @wip
+  @ignore
   Scenario: install gems and packages
     Given The default aruba timeout is 120 seconds
     Given a file named "test_repo.yml" with:

data/features/clenver_version.feature

@@ -0,0 +1,11 @@
+Feature: Clenver return its version
+  In order to improve error reports from users
+  Application should return correct version
+
+  Scenario: Exit correctly when asked about version
+    When I run `clenver version`
+    Then the exit status should be 0
+
+  Scenario: Return correct version number
+    When I run `clenver version`
+    Then the output should contain correct version

data/features/step_definitions/clenver_steps.rb

@@ -28,3 +28,9 @@ Then(/^the following remote (?:uris|branches) should be connected in "(.*?)":$/)
     res.to_i.should eq(2)
   end
 end
+
+Then(/^the output should contain correct version$/) do
+    require 'clenver/version'
+    assert_partial_output(Clenver::VERSION, all_output)
+end
+

data/lib/clenver.rb

@@ -1,4 +1,4 @@
 require 'clenver/version.rb'
 
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
+module Clenver
+end

data/lib/clenver/cli.rb

@@ -0,0 +1,43 @@
+require 'clenver'
+require 'clenver/runner'
+require 'clenver/logging'
+require 'thor'
+require 'thor/actions'
+
+module Clenver
+  class CLI < Thor
+    include Thor::Actions
+    include Logging
+    def self.start(*)
+      super
+      # logger.debug("args: #{args}")
+      # path = args[0]
+      # dst_dist = args[1]
+      # Clenver::Runner.new(path, dst_dist).start
+    end
+
+    def initialize(*)
+      super
+    end
+
+    default_task :help
+
+    def help(cli = nil)
+      logger.error("Not implemented")
+    end
+
+    desc "init [FILE]", "initialize $HOME directory according to instructions in FILE"
+    def init(config, dst = nil)
+      if File.exist?(config)
+        Clenver::Runner.new(config, dst).start
+      else
+        exit 2
+      end
+    end
+
+    desc "version", "Prints the clenver's version information" 
+    def version
+      logger.info("Clenver version #{Clenver::VERSION}")
+    end
+  end
+end

data/lib/clenver/version.rb

@@ -1,3 +1,3 @@
 module Clenver
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/test/vbox/regression.sh

@@ -46,7 +46,7 @@ no_pass_ssh () {
     startvm $1
     sleep 3
     vboxmanage controlvm $1 keyboardputscancode 1C 9C
-    sleep 45
+    sleep 60
     # cat host pub key to guest .ssh/authorized_keys
     sc_send $1 'mkdir -p $HOME/.ssh'
     st_pt=' > $HOME/.ssh/authorized_keys'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clenver
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Piotr Król
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -118,10 +132,12 @@ files:
 - clenver.rdoc
 - features/clenver.feature
 - features/clenver_init.feature
+- features/clenver_version.feature
 - features/step_definitions/clenver_steps.rb
 - features/support/env.rb
 - lib/clenver.rb
 - lib/clenver/assets/sample.yml
+- lib/clenver/cli.rb
 - lib/clenver/link.rb
 - lib/clenver/logging.rb
 - lib/clenver/package_manager.rb