instructions_list 1.0.9.4.1.beta → 1.0.10.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ba1c64d1ffc87cb9ebea982ad1e8e3e47fd2ae
-  data.tar.gz: 0326eb374c345059dd291703a57b8c76529c46c6
+  metadata.gz: 7a92a3be12a91a6eeb61536331a1fceff8a930fb
+  data.tar.gz: 0cde8f4a0b3697626698fce31c6b6c0478ccf0f7
 SHA512:
-  metadata.gz: eb6f5b58ded1a52fcc2675e039a751c67fb9686458a1ef1c475ed65f823876bf6c0826bb212bfe9ae89883d7f761c29388e9c14fec684fadf9d287b0bc7dc78d
-  data.tar.gz: edb9110571919eca2bb92e303371c3bb9a74088589620aa52e74b88cc0ff53e1b39bc4f791dd6e35263ab0308fc9bec451bc171ce1c312ab5e64c98f8f5808a7
+  metadata.gz: 95971c8aeaa9dc4866bc53d4526d53b6db0586345edb2dc1dd048c8fb6868b904e6abbfdb3c84e677156f45c1d79f0915ba63660055ad70d044b712aeb54142e
+  data.tar.gz: 5cbf030565c4042851071efb28b0d8939ba9cfa969d78cca234513dc22742088c1da900e5a3c2e45b2166028cc94232210a309711f65b65bca0b1c38bbc8cbae

data/.instructions/cache/check_child.rb

@@ -3,7 +3,7 @@ instruction 'check:child' do
     It::Is.done? 'check:child'
   }
   instruct{
-     `echo check child`
+     system "echo check child"
   }
 
   uninstruct{

data/.instructions/cache/check_ok.rb

@@ -4,12 +4,12 @@ instruction 'check:ok' do
     It::Is.done? 'check:ok'
   }
   instruct{
-     `sudo echo check ok!`
+     system "sudo echo check ok!"
   }
 
   uninstruct{
-      `echo poop`
-      `echo poop you`
-      `sudo echo poop`
+      system 'echo poop'
+      system 'echo poop you'
+      system 'sudo echo poop'
     }
 end

data/exe/il

@@ -23,14 +23,16 @@ module InstructionsList
     desc "reset", "reset state"
     def reset
 
-      if project?
-        system "rm -rf #{STATE}" if File.exists? STATE
-      end
-
-      if home?
-        Dir.chdir(ENV['HOME']) do
+      instructable do
+        if project?
           system "rm -rf #{STATE}" if File.exists? STATE
         end
+
+        if home?
+          Dir.chdir(ENV['HOME']) do
+            system "rm -rf #{STATE}" if File.exists? STATE
+          end
+        end
       end
 
     end
@@ -38,126 +40,134 @@ module InstructionsList
     desc "sync", "synchronize the instructions"
     option :reset
     def sync key=nil
-      begin
-        if project?
-          system "mkdir -p #{PROJECT_CACHE}"
-          system "mkdir -p #{PROJECT_CACHE_ARTIFACTS}"
-          if options[:reset]
-            system "rm -rf #{PROJECT_CACHE}" if Dir.exists? PROJECT_CACHE
+      instructable do
+        begin
+          if project?
+            system "mkdir -p #{PROJECT_CACHE}"
+            system "mkdir -p #{PROJECT_CACHE_ARTIFACTS}"
+            if options[:reset]
+              system "rm -rf #{PROJECT_CACHE}" if Dir.exists? PROJECT_CACHE
+            end
+            CacheBuilder.new(get_key,HOST,cache=PROJECT_CACHE,artifact_cache=PROJECT_CACHE_ARTIFACTS).build
           end
-          CacheBuilder.new(get_key,HOST,cache=PROJECT_CACHE,artifact_cache=PROJECT_CACHE_ARTIFACTS).build
-        end
 
-        if home?
-          Dir.chdir ENV['HOME'] do
-            if options[:reset]
-              system "rm -rf #{HOME_CACHE}" if Dir.exists? HOME_CACHE
+          if home?
+            Dir.chdir ENV['HOME'] do
+              if options[:reset]
+                system "rm -rf #{HOME_CACHE}" if Dir.exists? HOME_CACHE
+              end
+              CacheBuilder.new(get_key,HOST,cache=HOME_CACHE,artifact_cache=HOME_CACHE_ARTIFACTS).build
             end
-            CacheBuilder.new(get_key,HOST,cache=HOME_CACHE,artifact_cache=HOME_CACHE_ARTIFACTS).build
           end
+        rescue SocketError
+          say "Ooooops cant find #{HOST}"
         end
-      rescue SocketError
-        say "Ooooops cant find #{HOST}"
       end
-
     end
 
 
     desc "list", "list all instructions"
     def instructions
-      sync
-
-      if project?
-        list_from "Project", PROJECT_CACHE << '/' do |name|
-          say show_command_for name
-        end
-        puts ""
-        list_from "Home", HOME_CACHE << '/' do |name|
-          say show_command_for name
-        end
 
-        return
+      instructable do
 
-      end
+        if project?
+          list_from "", PROJECT_CACHE << '/' do |name|
+            say show_command_for name
+          end
+          puts ""
+          return
+        end
 
-      Dir.chdir(ENV['HOME']) do
-        list_from "Home", HOME_CACHE << '/' do |name|
-          say show_command_for name
+        if home?
+          list_from "", HOME_CACHE << '/' do |name|
+            say show_command_for name
+          end
+          puts ""
+          return
         end
       end
-
     end
 
     desc "info" , "display information"
     def info
-      if has_name?
-        say "connected to : #{get_name}"
-      else
-        say "connected to\ key: #{get_key}"
-      end
-      say "host: #{HOST}"
-      if File.exist? STATE
-        puts ""
-        `cat #{STATE}`.split("\n").each do |line|
-          say "#{line.chomp} ✔"
+      instructable do
+        if has_name?
+          say "connected to : #{get_name}"
+        else
+          say "connected to\ key: #{get_key}"
+        end
+        say "host: #{HOST}"
+        if File.exist? STATE
+          puts ""
+          `cat #{STATE}`.split("\n").each do |line|
+            say "#{line.chomp} ✔"
+          end
+          puts ""
         end
-        puts ""
       end
+
     end
 
 
     desc "do", "do an instruction"
     option :force
     def do name
-      sync
-      if name.nil?
-        say "oops ! you need a name"
-        return
-      end
+      instructable do
+        sync
+        if name.nil?
+          say "oops ! you need a name"
+          return
+        end
 
-      begin
-        CHECKED.clear
-        STACK.clear
-        load_from "Instructions", HOME_CACHE << "/" if home?
-        load_from "Projects", PROJECT_CACHE << "/" if project?
-        do_instruction name, STACK, options[:force]
-      rescue => e
-
-        say ""
-        say e.message
-        say ""
-        if e.message.include? "cant find"
-          instructions
+        begin
+          CHECKED.clear
+          STACK.clear
+          load_from "Instructions", HOME_CACHE << "/" if home?
+          load_from "Projects", PROJECT_CACHE << "/" if project?
+          do_instruction name, STACK, options[:force]
+        rescue => e
+
+          say ""
+          say e.message
+          say ""
+          if e.message.include? "cant find"
+            instructions
+          end
+          say ""
         end
-        say ""
       end
 
+
     end
 
     desc "undo", "undo an instruction"
     option :force
     def undo name
-      sync
-      if name.nil?
-        say "oops ! you need a name"
-        return
-      end
 
-      begin
-        CHECKED.clear
-        STACK.clear
-        load_from "Instructions", HOME_CACHE << "/" if home?
-        load_from "Projects", PROJECT_CACHE << "/" if project?
-        undo_instruction name, STACK, options[:force]
-      rescue => e
-
-        say ""
-        say e.message
-        say ""
-        if e.message.include? "cant find"
-          instructions
+      instructable do
+        sync
+        if name.nil?
+          say "oops ! you need a name"
+          return
+        end
+
+        begin
+          CHECKED.clear
+          STACK.clear
+          load_from "Instructions", HOME_CACHE << "/" if home?
+          load_from "Projects", PROJECT_CACHE << "/" if project?
+          undo_instruction name, STACK, options[:force]
+        rescue => e
+
+          say ""
+          say e.message
+          say ""
+          if e.message.include? "cant find"
+            instructions
+          end
+          say ""
         end
-        say ""
       end
 
     end
@@ -167,6 +177,15 @@ module InstructionsList
 
     no_tasks do
 
+
+      def instructable
+        if project? || home?
+          yield
+        else
+          say "Oooops! #{Dir.pwd} is not instructable!"
+        end
+      end
+
       def get_key
 	      return "Not connected!" unless File.exists? KEY_PATH
         File.read(KEY_PATH).chomp

data/lib/instructions_list/version.rb

@@ -1,3 +1,3 @@
 module InstructionsList
-	VERSION = "1.0.9.4.1.beta"
+	VERSION = "1.0.10.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instructions_list
 version: !ruby/object:Gem::Version
-  version: 1.0.9.4.1.beta
+  version: 1.0.10.beta
 platform: ruby
 authors:
 - Coco Coder (aka Delaney Burke)