instructions_list 1.0.2.beta → 1.0.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2c7238c6cb5eb05eb8b12f238a189853af5d7d
-  data.tar.gz: 748a22a30fae82f2a33e1b6bdb6608867b372e44
+  metadata.gz: 01f435854efca5c2ef03dbdf2e55b340ee4a000c
+  data.tar.gz: 53c3a4202faedec87e6a7e40ae9f1c036c1edb71
 SHA512:
-  metadata.gz: 2d1c31d9725f4424d2e39c544180099d4dbb88c16b52e4b31904a0b92bb2c0f059fa972f1d7ef83c10ad24ef79237231e40c3693e0cb78d7f9ad73b710b0772d
-  data.tar.gz: 4f96b6f5d50b5cff428579ffc24127b38e4bfbc1f1338b5e68093d48c8ec65361045ca6b5cdf40d2aa0a31f7947af2fd88c9173f20a4f90c05a7e97dac80751f
+  metadata.gz: ef66f23557dc6ff795a28fbbb63ec3468f7167b77e20ac986ddab7f9f245d7216f63606c8312f75f89cf0f2dcdcdcfca87f1c618afb7c2a677025d6ae062af42
+  data.tar.gz: 7e98d832553bd63cc803651ad38ff8fc7ee7736732184e8afcca40ea2adddfdf6f415e18c669e4197293e75ad24a05fc92bafcaba2ea8a879eecf82dcf9d5f62

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea

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

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

data/.instructions/key

@@ -0,0 +1 @@
+ILSIKXHMNCF

data/.ruby-version

@@ -0,0 +1 @@
+system

data/exe/il

@@ -1,4 +1,4 @@
-  #!/usr/bin/env ruby
+#!/usr/bin/env ruby
 require "thor"
 require 'pry'
 require_relative "../lib/instructions_list/version"
@@ -27,63 +27,83 @@ module InstructionsList
     end
     desc "init KEY", "initialize a il directory with list key"
     def init key
-      `mkdir -p ./.instructions/`
-      `mkdir -p instructions`
-      `touch ./.instructions/key`
-      `echo #{key} > ./.instructions/key`
+      `touch #{KEY_PATH}`
+      `echo #{key} > #{KEY_PATH}`
       connect key
     end
     desc "reset", "reset state"
     def reset name=:all
       instructable do
-        `rm ./.instructions/state` if name == :all
-        `ex +g/#{name}/d -cwq ./.instructions/state`
+        `rm #{STATE}` if name == :all
+        `ex +g/#{name}/d -cwq #{STATE}`
       end
     end
     desc "sync", "synchronize the instructions"
     option :reset
     def sync
-      `mkdir -p /tmp/il/cache`
-      Dir.chdir ENV['HOME'] do
+      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 #{CACHE}` if Dir.exists? CACHE
+          `rm -rf #{PROJECT_CACHE}` if Dir.exists? PROJECT_CACHE
           return
         end
 
         instructable do
           begin
-              CacheBuilder.new(get_key).build
+            CacheBuilder.new(get_key,HOST,cache=PROJECT_CACHE,artifact_cache=PROJECT_CACHE_ARTIFACTS).build
+            puts "built cache"
           rescue SocketError
-
           end
         end
+
+      else
+        return sync_home_instructions
       end
     end
 
+
     desc "instructions", "list all instructions"
     def instructions
-      # puts ""
-      # list_from "Core","#{File.join(File.dirname(__FILE__), "../instructions/")}" do |path|
-      #   say show_command_for path
-      # end
-      puts ""
-      list_from "Instructions", CACHE << "/" do |path|
-        say show_command_for path
-      end
-      puts ""
-      # list_from "Home Directory","#{ENV['HOME']}/instructions/" do |path|
-      #   say show_command_for path
-      # end
-      #
-      # puts ""
-      #
-      # return if `pwd`.chomp == ENV['HOME']
-      #
-      # list_from "Current Project","./instructions/" do |path|
-      #   say show_command_for path
-      # end
-      #
-      # puts ""
+
+      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
+          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
+          end
+        end
+      end
+
+
+
+
     end
 
     desc "info" , "display information"
@@ -96,7 +116,7 @@ module InstructionsList
     def connect key
       instructable do
         disconnect
-        `echo #{key} > ./.instructions/key`
+        `echo #{key} > #{KEY_PATH}`
         `il sync`
       end
 
@@ -106,7 +126,7 @@ module InstructionsList
     def disconnect
       instructable do
         `il sync --reset`
-        `rm ./.instructions/key`
+        `rm #{KEY_PATH}`
       end
     end
 
@@ -119,7 +139,7 @@ module InstructionsList
         #load_from "Defaults","#{File.join(File.dirname(__FILE__), "../instructions/")}"
         #load_from "User","#{ENV['HOME']}/instructions/"
         #load_from "Project","./instructions/"
-        load_from "Instructions", CACHE << "/"
+        load_from "Instructions", HOME_CACHE << "/"
         handle_instruction name,STACK,options[:force]
       end
     end
@@ -127,25 +147,50 @@ module InstructionsList
     map list: :instructions
 
     no_tasks do
+      def sync_home_instructions
+        `mkdir -p /tmp/il/cache`
+        Dir.chdir ENV['HOME'] do
+
+          if options[:reset]
+            `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
+	      return "Not connected!" unless File.exists? KEY_PATH
         File.read(KEY_PATH).chomp
       end
-      def instructable
-
-        return false unless home?
 
+      def instructable?
         if Dir.exists? "./instructions"
           if Dir.exists? "./.instructions"
             if File.exists? "./.instructions/key"
-              yield
-              return
+              return true
             end
           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?

data/lib/instructions_list/version.rb

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

data/lib/instructions_list.rb

@@ -7,8 +7,13 @@ module InstructionsList
   INSTRUCTIONS=[]
   STACK=[]
   CHECKED=[]
-  CACHE = "/tmp/il/cache"
-  CACHE_ARTIFACTS="#{CACHE}/artifacts"
+
+  HOME_CACHE = "/tmp/il/cache"
+  HOME_CACHE_ARTIFACTS="#{HOME_CACHE}/artifacts"
+
+  PROJECT_CACHE = "./.instructions/cache"
+  PROJECT_CACHE_ARTIFACTS="#{PROJECT_CACHE}/artifacts"
+
   KEY_PATH="./.instructions/key"
   HOST= ENV.fetch('INSTRUCTIONS_LIST_HOST',"instructionslist.com")
   class It
@@ -17,8 +22,8 @@ module InstructionsList
     end
     class Is
       def self.done? name
-      return false unless File.exists? "./.instructions/state"
-       File.readlines("./.instructions/state").include? "#{name}\n"
+      return false unless File.exists? STATE
+       File.readlines(STATE).include? "#{name}\n"
       end
       def self.running? name
         !`ps aux | grep #{name} | grep -v grep`.empty?
@@ -73,8 +78,8 @@ module InstructionsList
 
     def done(name)
       `mkdir -p './.instructions/'`
-      `touch ./.instructions/state`
-      `echo #{name} >> ./.instructions/state`
+      `touch #{STATE}`
+      `echo #{name} >> #{STATE}`
       check name
     end
 
@@ -86,47 +91,53 @@ module InstructionsList
 
 
   class CacheItem
-    def initialize(file_name)
+    def initialize(file_name,cache=HOME_CACHE)
       @file_name = file_name
+      @cache = cache
     end
     def write content
-      File.open("#{CACHE}/#{@file_name}","w") do |file|
+      File.open("#{@cache}/#{@file_name}", "w") do |file|
         file.puts content
       end
     end
   end
 
   class CacheArtifactItem
-    def initialize(file_name)
+    def initialize(file_name,cache=HOME_CACHE_ARTIFACTS)
       @file_name = file_name
+      @cache = cache
     end
     def write content,directory
-      `mkdir -p #{CACHE_ARTIFACTS}/#{directory}`
-      File.open("#{CACHE_ARTIFACTS}/#{directory}/#{@file_name}","w") do |file|
+      `mkdir -p #{@cache}/#{directory}`
+      File.open("#{@cache}/#{directory}/#{@file_name}", "w") do |file|
         file.puts content
       end
     end
   end
 
   class CacheBuilder
-    def initialize(key,host=HOST)
+    def initialize(key,host=HOST,cache=HOME_CACHE,artifact_cache=HOME_CACHE_ARTIFACTS)
       @key = key
       @host = host
+      @cache = cache
+      @artifact_cache =artifact_cache
     end
     def build
       begin
+        puts "http://#{@host}/lists/#{@key}.json"
+
         content = JSON.parse open("http://#{@host}/lists/#{@key}.json").read
-        `mkdir -p #{CACHE}`
+        `mkdir -p #{@cache}`
         content["instructions"].each do |instruction|
 
           CacheItem
-            .new(instruction["file_name"])
+            .new(instruction["file_name"],@cache)
             .write(instruction["file_contents"])
 
       	  instruction["artifacts"].each do |artifact|
 
       	   CacheArtifactItem
-            .new(artifact["file_name"])
+            .new(artifact["file_name"],cache=@artifact_cache)
       	    .write(artifact["contents"],content["key"])
 
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instructions_list
 version: !ruby/object:Gem::Version
-  version: 1.0.2.beta
+  version: 1.0.3.beta
 platform: ruby
 authors:
 - Coco Coder (aka Delaney Burke)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,9 @@ extra_rdoc_files: []
 files:
 - ".byebug_history"
 - ".gitignore"
+- ".instructions/cache/install:redis.rb"
+- ".instructions/key"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -155,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Instruction List , an automated configuration management tool