instructions_list 1.0.3.beta → 1.0.4.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f435854efca5c2ef03dbdf2e55b340ee4a000c
-  data.tar.gz: 53c3a4202faedec87e6a7e40ae9f1c036c1edb71
+  metadata.gz: 178f2f01804312efebddae3724913bd8a82f2cf9
+  data.tar.gz: 1888e74f845861bd7264939012230cac5168840a
 SHA512:
-  metadata.gz: ef66f23557dc6ff795a28fbbb63ec3468f7167b77e20ac986ddab7f9f245d7216f63606c8312f75f89cf0f2dcdcdcfca87f1c618afb7c2a677025d6ae062af42
-  data.tar.gz: 7e98d832553bd63cc803651ad38ff8fc7ee7736732184e8afcca40ea2adddfdf6f415e18c669e4197293e75ad24a05fc92bafcaba2ea8a879eecf82dcf9d5f62
+  metadata.gz: f530cc89303795277fcf94eed2ea0543b0d9731454efe8b0d268aedf0014280425b1bee333c8f4a765318f98ae4c43ddface76bc54792fc8df5a3140a9339f87
+  data.tar.gz: e567d639a4819b3f9e409f874cd5cd0575d7ab1b60bea8ef8494484634a5e43a2442c8dbaf197d145ab1bf32747dabda078bb04dec196c567197e10522a44f6e

data/exe/il

@@ -4,21 +4,8 @@ require 'pry'
 require_relative "../lib/instructions_list/version"
 require_relative "../lib/instructions_list"
 
-
 module InstructionsList
 
-  class Instructions < Thor
-    include Thor::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-    desc "add", "add instruction"
-    def add name
-      puts "add #{name} instruction"
-    end
-  end
-
   class CLI < Thor
     include Thor::Actions
 
@@ -27,14 +14,19 @@ module InstructionsList
     end
     desc "init KEY", "initialize a il directory with list key"
     def init key
+      `mkdir -p #{INSTRUCTIONS_DIR}`
       `touch #{KEY_PATH}`
       `echo #{key} > #{KEY_PATH}`
-      connect key
     end
     desc "reset", "reset state"
     def reset name=:all
       instructable do
-        `rm #{STATE}` if name == :all
+        if name == :all
+          `rm #{STATE}` if File.exists? STATE
+          `rm -rf .instructions`
+          return
+        end
+
         `ex +g/#{name}/d -cwq #{STATE}`
       end
     end
@@ -42,23 +34,15 @@ module InstructionsList
     option :reset
     def sync
       if instructable?
-
-        puts "is instructable!"
-
         `mkdir -p #{PROJECT_CACHE}`
-        puts "created the project cache"
         `mkdir -p #{PROJECT_CACHE_ARTIFACTS}`
-        puts "created the project cache artifacts"
-
         if options[:reset]
           `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
-            puts "built cache"
           rescue SocketError
           end
         end
@@ -72,38 +56,23 @@ module InstructionsList
     desc "instructions", "list all instructions"
     def instructions
 
-      if home?
-
-        list_from "Instructions", HOME_CACHE << "/" do |path|
-          say show_command_for path
-        end
-
-        return
-      end
-
-      if instructable?
-        unless home?
-
-          list_from "Project", PROJECT_CACHE << "/" do |path|
-            say show_command_for path
+      if project?
+        puts "project instructions!\n"
+        puts "list home instructions!"
+      elsif home?
+        Dir.chdir(ENV['HOME']) do
+          list_from "home", HOME_CACHE << '/' do |name|
+            say show_command_for name
           end
-          puts ""
-          list_from "Home Directory", HOME_CACHE << "/" do |path|
-            say show_command_for path
-          end
-
         end
       else
-        Dir.chdir (ENV['HOME']) do
-          list_from "Instructions", HOME_CACHE << "/" do |path|
-            say show_command_for path
+        Dir.chdir(ENV['HOME']) do
+          list_from "home", HOME_CACHE << '/' do |name|
+            say show_command_for name
           end
         end
       end
 
-
-
-
     end
 
     desc "info" , "display information"
@@ -112,36 +81,27 @@ module InstructionsList
       say "host: #{HOST}"
     end
 
-    desc "connect KEY" , "connect to a list"
-    def connect key
-      instructable do
-        disconnect
-        `echo #{key} > #{KEY_PATH}`
-        `il sync`
-      end
-
-    end
-
-    desc "disconnect" , "disconnect from a list"
-    def disconnect
-      instructable do
-        `il sync --reset`
-        `rm #{KEY_PATH}`
-      end
-    end
 
     desc "do", "do an instruction"
     option :force
-    def do name=:all
-      CHECKED.clear
-      STACK.clear
-      instructable do
-        #load_from "Defaults","#{File.join(File.dirname(__FILE__), "../instructions/")}"
-        #load_from "User","#{ENV['HOME']}/instructions/"
-        #load_from "Project","./instructions/"
-        load_from "Instructions", HOME_CACHE << "/"
-        handle_instruction name,STACK,options[:force]
+    def do name
+      if name.nil?
+        say "oops ! you need a name"
+        return
+      end
+
+      begin
+        CHECKED.clear
+        STACK.clear
+        instructable do
+          load_from "Instructions", HOME_CACHE << "/" if home?
+          load_from "Projects", PROJECT_CACHE << "/" if project?
+          handle_instruction name,STACK,options[:force]
+        end
+      rescue => e
+        puts e.message
       end
+
     end
 
     map list: :instructions
@@ -173,13 +133,13 @@ module InstructionsList
       end
 
       def instructable?
-        if Dir.exists? "./instructions"
-          if Dir.exists? "./.instructions"
-            if File.exists? "./.instructions/key"
-              return true
-            end
+
+        if Dir.exists? "./.instructions"
+          if File.exists? "./.instructions/key"
+            return true
           end
         end
+
         false
       end
 
@@ -197,22 +157,24 @@ module InstructionsList
         `pwd`.chomp == ENV['HOME']
       end
 
+      def project?
+        File.exists?("./instructions") && !home?
+      end
+
 
-      def show_command_for path
-        return "  None" if path == "  None"
-        "  il do #{path}"
+      def show_command_for name
+        "  il do #{command_name(name)}"
       end
 
       def list_from location,path
-        puts "#{location}"
-        if Dir["#{path}*.rb"].any?
-          Dir["#{path}*.rb"].each {|file|
-            pn = Pathname.new(file)
-            yield "#{File.basename(pn)}".gsub(".rb","")
-          }
-        else
-          yield "  None"
-        end
+
+        puts "#{location}\n"
+        
+        Dir["#{path}*.rb"].each {|file|
+          pn = Pathname.new(file)
+          yield File.basename(pn).gsub(".rb","")
+        }
+
       end
 
       def load_from name, path
@@ -225,12 +187,14 @@ module InstructionsList
       end
 
       def handle_instruction name,stack,force
-        instruction = InstructionsList::INSTRUCTIONS.find{ |i| i.name == name  }
-        raise "Ooooops cant find #{instruction}" if instruction.nil?
+        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? dependancy
-           stack << dependancy
-           handle_instruction(dependancy,stack,force)
+          unless stack.include? command_name(dependancy.gsub(" ","_"))
+           stack << command_name(dependancy.gsub(" ","_"))
+           handle_instruction(command_name(dependancy.gsub(" ","_")),stack,force)
           end
         end
         execute instruction,force: force
@@ -251,8 +215,6 @@ module InstructionsList
         end
       end
     end
-    #desc "instructions", "instructions"
-    #subcommand "instructions", Instructions
   end
 end
 

data/lib/instructions_list/version.rb

@@ -1,3 +1,3 @@
 module InstructionsList
-  VERSION = "1.0.3.beta"
+  VERSION = "1.0.4.beta"
 end

data/lib/instructions_list.rb

@@ -7,14 +7,13 @@ module InstructionsList
   INSTRUCTIONS=[]
   STACK=[]
   CHECKED=[]
-
-  HOME_CACHE = "/tmp/il/cache"
+  INSTRUCTIONS_DIR=".instructions"
+  HOME_CACHE = "#{ENV['HOME']}/#{INSTRUCTIONS_DIR}/cache"
   HOME_CACHE_ARTIFACTS="#{HOME_CACHE}/artifacts"
-
   PROJECT_CACHE = "./.instructions/cache"
   PROJECT_CACHE_ARTIFACTS="#{PROJECT_CACHE}/artifacts"
-
-  KEY_PATH="./.instructions/key"
+  KEY_PATH="./#{INSTRUCTIONS_DIR}/key"
+  STATE="./.instructions/state"
   HOST= ENV.fetch('INSTRUCTIONS_LIST_HOST',"instructionslist.com")
   class It
     def self.exists? path
@@ -79,13 +78,25 @@ module InstructionsList
     def done(name)
       `mkdir -p './.instructions/'`
       `touch #{STATE}`
-      `echo #{name} >> #{STATE}`
-      check name
+      `echo #{command_name(name.to_s.gsub(" ","_"))} >> #{STATE}`
+      check command_name(name)
+    end
+
+    def command_name(name)
+      name.to_s.gsub("_", ":")
+    end
+    def reverse_command_name(name)
+      name.to_s.gsub(":", "_")
     end
 
     def check name
-      system "echo #{name} ✔︎" unless CHECKED.include? name
-      CHECKED << name
+
+      unless CHECKED.include? command_name(name)
+        system "echo #{command_name(name)} ✔︎"
+        return
+      end
+
+      CHECKED << command_name(name)
     end
   end
 
@@ -96,7 +107,7 @@ module InstructionsList
       @cache = cache
     end
     def write content
-      File.open("#{@cache}/#{@file_name}", "w") do |file|
+      File.open("#{@cache}/#{reverse_command_name(@file_name)}", "w") do |file|
         file.puts content
       end
     end
@@ -109,7 +120,7 @@ module InstructionsList
     end
     def write content,directory
       `mkdir -p #{@cache}/#{directory}`
-      File.open("#{@cache}/#{directory}/#{@file_name}", "w") do |file|
+      File.open("#{@cache}/#{directory}/#{reverse_command_name(@file_name)}", "w") do |file|
         file.puts content
       end
     end
@@ -124,8 +135,6 @@ module InstructionsList
     end
     def build
       begin
-        puts "http://#{@host}/lists/#{@key}.json"
-
         content = JSON.parse open("http://#{@host}/lists/#{@key}.json").read
         `mkdir -p #{@cache}`
         content["instructions"].each do |instruction|

data/lib/package_manager.rb

@@ -1,4 +1,4 @@
-module InstructionsList do
+module InstructionsList
   class PackageManager
     def self.aptget?
       `which apt-get`.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instructions_list
 version: !ruby/object:Gem::Version
-  version: 1.0.3.beta
+  version: 1.0.4.beta
 platform: ruby
 authors:
 - Coco Coder (aka Delaney Burke)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,6 @@ extra_rdoc_files: []
 files:
 - ".byebug_history"
 - ".gitignore"
-- ".instructions/cache/install:redis.rb"
 - ".instructions/key"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md

data/.instructions/cache/install:redis.rb

@@ -1,8 +0,0 @@
-instruction 'install:redis' do
-  instructed?{
-  It::Is.done? "install:redis"
-}
-  instruct{
-  system "echo "install redis"" 
-}
-end