Finish 0.6.6

oscript-library · Oct 19, 2018 · cd1b4b1 · cd1b4b1
2 parents fdb0910 + 63391c9
commit cd1b4b1
Show file tree

Hide file tree

Showing 30 changed files with 1,150 additions and 655 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,12 @@
 exec.log
 test-reports/*.*
 *.ospx
-bin/*
+bin/*
+test*.xml
+bdd-*.xml
+
+*.ospx
+
+coverage/*
+
+.vscode/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,62 +1,79 @@
-sudo: required
+language: generic
 
-dist: trusty
+sudo: required
 
 notifications:
   email: false
-  
-before_install: 
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then 
-      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
-      sh -e /etc/init.d/xvfb start;
-      sleep 3;
-    fi
-  - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-  - echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-official.list
-  - sudo apt-get update
-  - sudo apt-get install mono-complete mono-devel
-  - wget -O os.deb http://oscript.io/downloads/latest/onescript-engine_1.0.18_all.deb
-  - sudo dpkg -i *.deb; sudo apt install -f
-  - sudo oscript /usr/share/oscript/lib/opm/src/opm.os install opm
-
-install: 
-  - sudo oscript /usr/share/oscript/lib/opm/src/opm.os install 1testrunner
-  - sudo oscript /usr/share/oscript/lib/opm/src/opm.os install 1bdd
-  - sudo oscript /usr/share/oscript/lib/opm/src/opm.os install
+
+services:
+  - docker
+
+addons:
+    sonarqube: true
+
+before_install:
+ # Load cached docker images
+  - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
+
+before_cache:
+  # Save tagged docker images
+  - >
+    mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
+    | xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
+
+install:
+    - docker pull harmit/ci-image
 
 env:
   global:
-  - CHANNEL=dev
-
+    - CHANNEL=dev
+    - PACKAGE_NAME=v8storage
+  matrix:
+    - OSCRIPT_VERSION=1_0_19
+    - OSCRIPT_VERSION=1_0_20
+    - OSCRIPT_VERSION=night-build
+matrix:
+  allow_failures:
+    - env: OSCRIPT_VERSION=night-build
 cache:
   directories:
     - '$HOME/.m2/repository'
     - '$HOME/.sonar/cache'
+    - '$HOME/docker'
+
+script:
+  - docker version
+  - docker run -it -e OSCRIPT_VERSION=$OSCRIPT_VERSION -v $(pwd):/work_dir harmit/ci-image sh -c 'cd /work_dir; sh /work_dir/travis-ci.sh; exit' | tee /tmp/test.log
+  - grep 'Результат прогона тестов <Да>' /tmp/test.log
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+  - ./sonar-qube.sh
+
+
 jobs:
   include:
-    #- stage: Тестирование 
-    #  script: oscript /usr/share/oscript/lib/opm/src/opm.os test
     - stage: Сборка и публикация github & hub.oscript.io
-      script: skip 
+      script: skip
       before_deploy:
-        - oscript /usr/share/oscript/lib/opm/src/opm.os build ./
+        - docker run -it -v $(pwd):/work_dir harmit/ci-image sh -c 'cd /work_dir; opm build ./ ; exit'
       deploy:
         - provider: releases
           api_key: "$GITHUB_OAUTH_TOKEN"
           file_glob: true
-          file: v8storage*.ospx
+          file: $PACKAGE_NAME*.ospx
           skip_cleanup: true
           on:
             branch: master
             tags: true
         - provider: script
           skip_cleanup: true
-          script: oscript /usr/share/oscript/lib/opm/src/opm.os push --token $GITHUB_OAUTH_TOKEN --channel dev --file ./v8storage-*.ospx;
+          script: docker run -it -v $(pwd):/work_dir evilbeaver/onescript:1.0.19 sh -c 'cd /work_dir; opm push --token $GITHUB_OAUTH_TOKEN --channel dev --file ./$PACKAGE_NAME-*.ospx; exit'
           on:
             branch: develop
         - provider: script
           skip_cleanup: true
-          script: oscript /usr/share/oscript/lib/opm/src/opm.os push --token $GITHUB_OAUTH_TOKEN --channel stable --file ./v8storage-*.ospx;
+          script: docker run -it -v $(pwd):/work_dir evilbeaver/onescript:1.0.19 sh -c 'cd /work_dir; opm push --token $GITHUB_OAUTH_TOKEN --channel stable --file ./$PACKAGE_NAME-*.ospx; exit'
           on:
             branch: master
             tags: true
diff --git a/LICENSE.md → LICENSE b/LICENSE.md → LICENSE
@@ -1,26 +1,26 @@
-The MIT License (MIT)
-=====================
-
-Copyright © `2017` `Khorev Aleksey <khorevaa@gmail.com>`
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the “Software”), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
+The MIT License (MIT)
+=====================
+
+Copyright © `2017` `Khorev Aleksey <khorevaa@gmail.com>`
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/epf/ОбработкаКонвертацииMXLJSON/ОбработкаКонвертацииMXLJSON.xml b/epf/ОбработкаКонвертацииMXLJSON/ОбработкаКонвертацииMXLJSON.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
-	<ExternalDataProcessor uuid="b909bc4a-420b-11e7-3b8d-bcee7b73c08f">
-		<InternalInfo>
-			<xr:ContainedObject>
-				<xr:ClassId>c3831ec8-d8d5-4f93-8a22-f9bfae07327f</xr:ClassId>
-				<xr:ObjectId>b909bc5e-420b-11e7-3b8d-bcee7b73c08f</xr:ObjectId>
-			</xr:ContainedObject>
-			<xr:GeneratedType name="ExternalDataProcessorObject.ОбработкаКонвертацииMXLJSON" category="Object">
-				<xr:TypeId>b909bc54-420b-11e7-3b8d-bcee7b73c08f</xr:TypeId>
-				<xr:ValueId>b909bc55-420b-11e7-3b8d-bcee7b73c08f</xr:ValueId>
-			</xr:GeneratedType>
-		</InternalInfo>
-		<Properties>
-			<Name>ОбработкаКонвертацииMXLJSON</Name>
-			<Synonym/>
-			<Comment/>
-			<DefaultForm/>
-			<AuxiliaryForm/>
-		</Properties>
-		<ChildObjects/>
-	</ExternalDataProcessor>
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+	<ExternalDataProcessor uuid="b909bc4a-420b-11e7-3b8d-bcee7b73c08f">
+		<InternalInfo>
+			<xr:ContainedObject>
+				<xr:ClassId>c3831ec8-d8d5-4f93-8a22-f9bfae07327f</xr:ClassId>
+				<xr:ObjectId>b909bc5e-420b-11e7-3b8d-bcee7b73c08f</xr:ObjectId>
+			</xr:ContainedObject>
+			<xr:GeneratedType name="ExternalDataProcessorObject.ОбработкаКонвертацииMXLJSON" category="Object">
+				<xr:TypeId>b909bc54-420b-11e7-3b8d-bcee7b73c08f</xr:TypeId>
+				<xr:ValueId>b909bc55-420b-11e7-3b8d-bcee7b73c08f</xr:ValueId>
+			</xr:GeneratedType>
+		</InternalInfo>
+		<Properties>
+			<Name>ОбработкаКонвертацииMXLJSON</Name>
+			<Synonym/>
+			<Comment/>
+			<DefaultForm/>
+			<AuxiliaryForm/>
+		</Properties>
+		<ChildObjects/>
+	</ExternalDataProcessor>
 </MetaDataObject>