instructions_list 1.0.8.5.beta → 1.0.9.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '077800184ff2fbe80353d10b849c9ad4dfb564c9'
-  data.tar.gz: 8e24f38fe4abf9a5a8eccb58e2a6436dcfe4b496
+  metadata.gz: 9388cc2104ae830ba9a03a6abfda944e84cbff43
+  data.tar.gz: a90e1b5341f68699411587cfa824e8a8f4d7374c
 SHA512:
-  metadata.gz: 62be52be80fb7fba7771bdf98133f13ce14b69f67fbefa521dc47f71c5c6906084e9875d76e0df09b2b1fd2c9b05dd1ee451c20801d38ae1862c7bd10439a6c9
-  data.tar.gz: a6aa6f93057368c0c1287fd8dcfa15fafd8314a194b30e29a4ea6dcd0f232aedd7eb1b67f5140c82fbfce0cdf9dd7f557ef612fd779d975aab8e219ecdf51e20
+  metadata.gz: 1921e7251fe57c296b25060912372b9fed697ca77ffc67843c01d36e7cf326f2ae8213e6288a80c9a922e12f8587e3e86ff4f47dc8ff63ee0f8d6ab7540bbafe
+  data.tar.gz: c07c8e50a62406998205b7c49e230d182f45a6d80419704947813941bd43e31c5aa18fe1ae02255d00e62b37bcb29182eb09c627280ffbba0a1368263b52f9c5

data/.instructions/cache/check_child.rb

@@ -0,0 +1,11 @@
+instruction 'check:child' do
+  instructed?{
+    It::Is.done? 'check:child'
+  }
+  instruct{
+     `echo check child`
+  }
+
+  uninstruct{
+    }
+end

data/.instructions/cache/check_ok.rb

@@ -0,0 +1,15 @@
+instruction 'check:ok' do
+    depends_on 'check:child'
+  instructed?{
+    It::Is.done? 'check:ok'
+  }
+  instruct{
+     `sudo echo check ok!`
+  }
+
+  uninstruct{
+      `echo poop`
+      `echo poop you`
+      `sudo echo poop`
+    }
+end

data/.instructions/key

@@ -0,0 +1 @@
+ILSGIKVWXND

data/.instructions/list_data

@@ -0,0 +1 @@
+demo

data/exe/il

@@ -17,40 +17,56 @@ module InstructionsList
       system "mkdir -p #{INSTRUCTIONS_DIR}"
       system "touch #{KEY_PATH}"
       system "echo #{key} > #{KEY_PATH}"
-      invoke :sync
+      sync
     end
+
     desc "reset", "reset state"
     def reset
-      instructable do
-        system "rm -rf .instructions" if File.exists? STATE
+
+      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
+
     desc "sync", "synchronize the instructions"
     option :reset
     def sync key=nil
-      if instructable?
-        system "mkdir -p #{PROJECT_CACHE}"
-        system "mkdir -p #{PROJECT_CACHE_ARTIFACTS}"
-        if options[:reset]
-          system "rm -rf #{PROJECT_CACHE}" if Dir.exists? PROJECT_CACHE
-          return
-        end
-        instructable do
-          begin
-            CacheBuilder.new(get_key,HOST,cache=PROJECT_CACHE,artifact_cache=PROJECT_CACHE_ARTIFACTS).build
-          rescue SocketError
+      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
 
-      else
-        return sync_home_instructions
+        if home?
+          Dir.chdir 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
+        end
+      rescue SocketError
+        say "Ooooops cant find #{HOST}"
       end
+
     end
 
 
     desc "list", "list all instructions"
     def instructions
-      invoke :sync
+      sync
+
       if project?
         list_from "Project", PROJECT_CACHE << '/' do |name|
           say show_command_for name
@@ -59,17 +75,14 @@ module InstructionsList
         list_from "Home", HOME_CACHE << '/' do |name|
           say show_command_for name
         end
-      elsif home?
-        Dir.chdir(ENV['HOME']) do
-          list_from "Home", HOME_CACHE << '/' do |name|
-            say show_command_for name
-          end
-        end
-      else
-        Dir.chdir(ENV['HOME']) do
-          list_from "Home", HOME_CACHE << '/' do |name|
-            say show_command_for name
-          end
+
+        return
+
+      end
+
+      Dir.chdir(ENV['HOME']) do
+        list_from "Home", HOME_CACHE << '/' do |name|
+          say show_command_for name
         end
       end
 
@@ -84,7 +97,11 @@ module InstructionsList
       end
       say "host: #{HOST}"
       if File.exist? STATE
-        say `cat #{STATE}`
+        puts ""
+        `cat #{STATE}`.split("\n").each do |line|
+          say "#{line.chomp} ✔"
+        end
+        puts ""
       end
     end
 
@@ -92,7 +109,7 @@ module InstructionsList
     desc "do", "do an instruction"
     option :force
     def do name
-      invoke :sync
+      sync
       if name.nil?
         say "oops ! you need a name"
         return
@@ -101,18 +118,18 @@ module InstructionsList
       begin
         CHECKED.clear
         STACK.clear
-        instructable do
-          load_from "Instructions", HOME_CACHE << "/" if home?
-          load_from "Projects", PROJECT_CACHE << "/" if project?
-          do_instruction name, STACK, options[:force]
+        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
-      rescue => e
-        puts ""
-        puts e.message
-        puts ""
-        puts `il list`
-        puts ""
+        say ""
       end
 
     end
@@ -120,7 +137,7 @@ module InstructionsList
     desc "undo", "undo an instruction"
     option :force
     def undo name
-	    invoke :sync
+      sync
       if name.nil?
         say "oops ! you need a name"
         return
@@ -129,18 +146,18 @@ module InstructionsList
       begin
         CHECKED.clear
         STACK.clear
-        instructable do
-          load_from "Instructions", HOME_CACHE << "/" if home?
-          load_from "Projects", PROJECT_CACHE << "/" if project?
-          undo_instruction name, STACK, options[:force]
+        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
-      rescue => e
-        puts ""
-        puts e.message
-        puts ""
-        system "il list"
-        puts ""
+        say ""
       end
 
     end
@@ -149,25 +166,6 @@ module InstructionsList
     map list: :instructions
 
     no_tasks do
-      def sync_home_instructions
-        system "mkdir -p /tmp/il/cache"
-        Dir.chdir ENV['HOME'] do
-
-          if options[:reset]
-            system "rm -rf #{HOME_CACHE}" if Dir.exists? HOME_CACHE
-            return
-          end
-
-          instructable do
-            begin
-              CacheBuilder.new(get_key).build
-            rescue SocketError
-            end
-          end
-        end
-      end
-
-
 
       def get_key
 	      return "Not connected!" unless File.exists? KEY_PATH
@@ -183,33 +181,13 @@ module InstructionsList
       end
 
 
-      def instructable?
-
-        if Dir.exists? "./.instructions"
-          if File.exists? "./.instructions/key"
-            return true
-          end
-        end
-
-        false
-      end
-
-      def instructable
-        if instructable?
-          yield
-          return
-        else
-          return false unless home?
-        end
-        say "Ooops! Not a instruction list directory"
-      end
-
       def home?
         `pwd`.chomp == ENV['HOME']
       end
 
       def project?
-        File.exists?("./instructions") && !home?
+        return false if home?
+        File.exists?("./.instructions")
       end
 
 
@@ -222,8 +200,7 @@ module InstructionsList
         puts "#{location}\n"
         
         Dir["#{path}*.rb"].each {|file|
-          pn = Pathname.new(file)
-          yield File.basename(pn).gsub(".rb","")
+          yield File.basename(file).gsub(".rb","")
         }
 
       end
@@ -231,17 +208,22 @@ module InstructionsList
       def load_from name, path
         if Dir["#{path}*.rb"].any?
           Dir["#{path}*.rb"].each {|file|
-            pn = Pathname.new(file)
             require file
           }
         end
       end
 
       def do_instruction name, stack, force
+
+        InstructionsList::INSTRUCTIONS
+
         instruction = InstructionsList::INSTRUCTIONS.find { |i|
           command_name(i.name.gsub(" ","_")) == command_name(name)
         }
         raise "Ooooops cant find #{command_name(name)}" if instruction.nil?
+
+        
+
         instruction.depends_on.each do |dependancy|
           unless stack.include? command_name(dependancy.gsub(" ","_"))
            stack << command_name(dependancy.gsub(" ","_"))

data/lib/instructions_list/version.rb

@@ -1,3 +1,3 @@
 module InstructionsList
-	VERSION = "1.0.8.5.beta"
+	VERSION = "1.0.9.0.beta"
 end

data/lib/instructions_list.rb

@@ -86,7 +86,6 @@ module InstructionsList
     def mark_as_done(name)
       system "mkdir -p './.instructions/'"
       system "touch #{STATE}"
-      system "echo #{command_name(name.to_s.gsub(" ","_"))} >> #{STATE}"
       check command_name(name)
     end
     def mark_as_undone(name)
@@ -102,12 +101,12 @@ module InstructionsList
 
     def check name
 
-      unless CHECKED.include? command_name(name)
+      if File.readlines(STATE).map{|line| line.chomp}.include? command_name(name)
         system "echo #{command_name(name)} ✔︎"
-        return
+      else
+        CHECKED << command_name(name)
+        system "echo #{command_name(name.to_s.gsub(" ","_"))} >> #{STATE}"
       end
-
-      CHECKED << command_name(name)
     end
   end
 

data/tags

@@ -4,13 +4,16 @@
 !_TAG_PROGRAM_NAME	Exuberant Ctags	//
 !_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
 !_TAG_PROGRAM_VERSION	5.8	//
+CLI	exe/il	/^  class CLI < Thor$/;"	c	class:InstructionsList
+CacheArtifactItem	lib/instructions_list.rb	/^  class CacheArtifactItem$/;"	c
 CacheBuilder	lib/instructions_list.rb	/^  class CacheBuilder$/;"	c
 CacheItem	lib/instructions_list.rb	/^  class CacheItem$/;"	c	class:InstructionsList
 DSL	lib/instructions_list.rb	/^  module DSL$/;"	m	class:InstructionsList
 Instruction	lib/instructions_list.rb	/^  class Instruction$/;"	c	class:InstructionsList
+InstructionsList	exe/il	/^module InstructionsList$/;"	m
 InstructionsList	lib/instructions_list.rb	/^module InstructionsList$/;"	m
 InstructionsList	lib/instructions_list/version.rb	/^module InstructionsList$/;"	m
-InstructionsList	lib/package_manager.rb	/^module InstructionsList do$/;"	m
+InstructionsList	lib/package_manager.rb	/^module InstructionsList$/;"	m
 Is	lib/instructions_list.rb	/^    class Is$/;"	c	class:InstructionsList.It
 It	lib/instructions_list.rb	/^  class It$/;"	c	class:InstructionsList
 PackageManager	lib/package_manager.rb	/^  class PackageManager$/;"	c	class:InstructionsList
@@ -18,18 +21,44 @@ aptget	lib/package_manager.rb	/^    def self.aptget?$/;"	F	class:InstructionsLis
 brew	lib/package_manager.rb	/^    def self.brew?$/;"	F	class:InstructionsList.PackageManager
 build	lib/instructions_list.rb	/^    def build$/;"	f	class:CacheBuilder
 check	lib/instructions_list.rb	/^    def check name$/;"	f	class:InstructionsList.DSL
-depends_on	lib/instructions_list.rb	/^    def depends_on name$/;"	f	class:InstructionsList.DSL
+command_name	lib/instructions_list.rb	/^    def command_name(name)$/;"	f	class:InstructionsList.DSL
+depends_on	lib/instructions_list.rb	/^      def depends_on name$/;"	f	class:InstructionsList.DSL
+do	exe/il	/^    def do name$/;"	f
+do_instruction	exe/il	/^      def do_instruction name, stack, force$/;"	f
 done	lib/instructions_list.rb	/^      def self.done? name$/;"	F	class:InstructionsList.It.Is
-done	lib/instructions_list.rb	/^    def done(name)$/;"	f	class:InstructionsList.DSL
+execute_instruction	exe/il	/^      def execute_instruction instruction, force: false$/;"	f
+execute_uninstruction	exe/il	/^      def execute_uninstruction instruction, force: false$/;"	f
 exists	lib/instructions_list.rb	/^    def self.exists? path$/;"	F	class:InstructionsList.It
+get_key	exe/il	/^      def get_key$/;"	f
+get_name	exe/il	/^      def get_name()$/;"	f
+has_name?	exe/il	/^      def has_name?$/;"	f
+home?	exe/il	/^      def home?$/;"	f
+info	exe/il	/^    def info$/;"	f
+init	exe/il	/^    def init key$/;"	f	class:InstructionsList.CLI
 initialize	lib/instructions_list.rb	/^    def initialize$/;"	f	class:InstructionsList.Instruction
-initialize	lib/instructions_list.rb	/^    def initialize(file_name)$/;"	f	class:InstructionsList.CacheItem
-initialize	lib/instructions_list.rb	/^    def initialize(key,host=HOST)$/;"	f	class:CacheBuilder
+initialize	lib/instructions_list.rb	/^    def initialize(file_name,cache=HOME_CACHE)$/;"	f	class:InstructionsList.CacheItem
+initialize	lib/instructions_list.rb	/^    def initialize(file_name,cache=HOME_CACHE_ARTIFACTS)$/;"	f	class:CacheArtifactItem
+initialize	lib/instructions_list.rb	/^    def initialize(key,host=HOST,cache=HOME_CACHE,artifact_cache=HOME_CACHE_ARTIFACTS)$/;"	f	class:CacheBuilder
 installed	lib/instructions_list.rb	/^      def self.installed? path$/;"	F	class:InstructionsList.It.Is
 instruct	lib/instructions_list.rb	/^    def instruct &block$/;"	f	class:InstructionsList.DSL
 instructed?	lib/instructions_list.rb	/^    def instructed? &block$/;"	f	class:InstructionsList.DSL
 instruction	lib/instructions_list.rb	/^    def instruction name,&block$/;"	f	class:InstructionsList.DSL
+instructions	exe/il	/^    def instructions$/;"	f	class:InstructionsList.CLI
+list_from	exe/il	/^      def list_from location,path$/;"	f
+load_from	exe/il	/^      def load_from name, path$/;"	f
+mark_as_done	lib/instructions_list.rb	/^    def mark_as_done(name)$/;"	f	class:InstructionsList.DSL
+mark_as_undone	lib/instructions_list.rb	/^    def mark_as_undone(name)$/;"	f	class:InstructionsList.DSL
 on	lib/instructions_list.rb	/^    def on os$/;"	f	class:InstructionsList.DSL
+project?	exe/il	/^      def project?$/;"	f
+reset	exe/il	/^    def reset$/;"	f	class:InstructionsList.CLI
+reverse_command_name	lib/instructions_list.rb	/^    def reverse_command_name(name)$/;"	f	class:InstructionsList.DSL
 running	lib/instructions_list.rb	/^      def self.running? name$/;"	F	class:InstructionsList.It.Is
+show_command_for	exe/il	/^      def show_command_for name$/;"	f
+source_root	exe/il	/^    def self.source_root$/;"	F	class:InstructionsList.CLI
+sync	exe/il	/^    def sync key=nil$/;"	f	class:InstructionsList.CLI
+undo	exe/il	/^    def undo name$/;"	f
+undo_instruction	exe/il	/^      def undo_instruction name, stack, force$/;"	f
+uninstruct	lib/instructions_list.rb	/^    def uninstruct &block$/;"	f	class:InstructionsList.DSL
 write	lib/instructions_list.rb	/^    def write content$/;"	f	class:InstructionsList.CacheItem
+write	lib/instructions_list.rb	/^    def write content,directory$/;"	f	class:CacheArtifactItem
 yum	lib/package_manager.rb	/^    def self.yum?$/;"	F	class:InstructionsList.PackageManager

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instructions_list
 version: !ruby/object:Gem::Version
-  version: 1.0.8.5.beta
+  version: 1.0.9.0.beta
 platform: ruby
 authors:
 - Coco Coder (aka Delaney Burke)
@@ -105,6 +105,10 @@ extra_rdoc_files: []
 files:
 - ".byebug_history"
 - ".gitignore"
+- ".instructions/cache/check_child.rb"
+- ".instructions/cache/check_ok.rb"
+- ".instructions/key"
+- ".instructions/list_data"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile